this commit does nothing 2

d24a2333 · Arjon Bujupi · 35396ad6 · d24a2333
Commit d24a2333 authored Mar 31, 2019 by Arjon Bujupi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

CHANGELOG.md CHANGELOG.md +0 -6

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
 # v0.2
 ----------
-<<<<<<< HEAD
 * Fixed the role for creating ingresses.
 * The operator is now more portable. You can define in the specs of Mautic if you want to deploy the service and the ingress. By default they are enabled. 
-=======
- Fixed the role for creating ingresses.
- The operator is now more portable. You can define in the specs of Mautic if you want to deploy the service and the ingress. By default they are enabled. 
->>>>>>> 2b7c6cfad10d33f571e1059e5b759f56ce2a7e75
-


 # v0.1