merge

abecms · Aug 16, 2016 · 61822a6 · 61822a6
1 parent d181c73
commit 61822a6
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Abe, A better engine
 
 > Abe is your __static websites generator__ with revolutionnary __self-descriptive__ templates
@@ -257,4 +256,3 @@ Other environment variables are available (like PORT for defining a listening po
 
 =======
 # abe-test-plugin
->>>>>>> e23f4a0d4369f09cb9263d29673c21dfb5331de6