Merge branch 'master' of https://github.com/sassoftware/viya-ark

sassoftware · Apr 1, 2020 · 8408603 · 8408603
2 parents 2735bcb + f7171be
commit 8408603
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog for SAS Viya ARK
 
 <!-- LATEST RELEASE START -->
+<<<<<<< HEAD
 ## Viya35-ark-1.3 - April 1, 2020
 - **Summary**:
   Enhancements and fixes related to Upgrade, Multi-Machine Services Utilities, Pre-Installation playbooks.
@@ -118,6 +119,8 @@
     - DEPENB-2009 - Do not update systemd on RHEL7 with pre-install playbook. 
 - Ansible Support: Ansible 2.5 - Ansible 2.7
 
+<!-- LATEST RELEASE END -->
+
 ## Viya34-ark-1.5 - July 11, 2019
 
 - **Summary**: