commiting

.c9revisions/config/autoload/README.md.c9save

@@ -0,0 +1,4 @@
+{"ts":1362078640639,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"<<<<<<< HEAD\n=======\nImportant\n=========\nCreate file local.php for your local repository.\nUse the sample local.php.dist !\n\n>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951\nAbout this directory:\n=====================\n\nBy default, this application is configured to load all configs in\n`./config/autoload/{,*.}{global,local}.php`. Doing this provides a\nlocation for a developer to drop in configuration override files provided by\nmodules, as well as cleanly provide individual, application-wide config files\nfor things like database connections, etc.\n"]],"start1":0,"start2":0,"length1":0,"length2":548}]],"length":548}
+{"contributors":[],"silentsave":true,"ts":1362078646674,"patch":[[{"diffs":[[-1,"<<<<<<< HEAD"],[0,"\n==="]],"start1":0,"start2":0,"length1":16,"length2":4}]],"length":536,"saved":false}
+{"ts":1362078649494,"patch":[[{"diffs":[[0," !\n\n"],[-1,">>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951\n"],[0,"Abou"]],"start1":107,"start2":107,"length1":57,"length2":8}]],"length":487,"saved":false}
+{"ts":1362078651597,"patch":[[{"diffs":[[-1,"\n"],[0,"=======\nImpo"]],"start1":0,"start2":0,"length1":13,"length2":12}]],"length":486,"saved":false}

config/autoload/README.md

@@ -1,11 +1,9 @@
-<<<<<<< HEAD
 =======
 Important
 =========
 Create file local.php for your local repository.
 Use the sample local.php.dist !
 
->>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
 About this directory:
 =====================