fix rebase

Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
kubernetes-sigs · Aug 7, 2020 · 14cc2a7 · 14cc2a7
1 parent 86373b3
commit 14cc2a7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,6 @@
 
 - Fix: add serviceaccount name in kustomize deployment (#1689) @jmthvt
 - Updates Oracle OCI SDK to latest (#1687) @ericrrath
-<<<<<<< HEAD
 - UltraDNS Provider (#1635) @kbhandari
 - Update apiVersions in docs (#1690) @ddgenome
 - use the github actions build status badge (#1702) @tariq1890