fix changelog

Optum · Mar 26, 2020 · 57fea76 · 57fea76
1 parent 9ce125b
commit 57fea76
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,10 +12,7 @@
 - Fix an issue when comparing the current Principal Policy Hash to the new version where the pointers were being compared and not the values
 - Update functional testing timeout to be 20 minutes from the default of 10 minutes
 - Fix to allow budget notification email templates > 4Kb
-<<<<<<< HEAD
-=======
 - Prevent non-admins from performing CRUD operations on other user's leases
->>>>>>> ee575e0b48e6001c6c26747b563489ea8c3223ac
 
 ## v0.28.0