Resolve merge conflicts

hgtonight · Mar 25, 2016 · 1b83ac5 · 1b83ac5
2 parents ee7c7ae + 0a10a8a
commit 1b83ac5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ Yaga requires:
 * Vanilla 2.2.x (Garden is the actual requirement)
 * Pretty URLs enabled
 
+## Contributing
+
+Please contribute fixes against the `develop` branch.
+
 ## Documentation
 
 Yaga's [main documentation page is here](http://hgtonight.github.io/Application-Yaga/).