Fixed goofs

ansible-community · Mar 3, 2017 · e2f6462 · e2f6462
1 parent f0371ad
commit e2f6462
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -114,3 +114,5 @@
 - Use all defined variables (thanks @arledesma)
 - Make redirect_address more specific by adding redirect address variable
 - Update CONTRIBUTORS
+- Fix merge conflict (thanks @arledesma)
+- Fix missed variable (thanks @arledesma)