[#2565] Fixing a bad merge conflict

weaverryan · weaverryan · commit 98c0ff666290 · 2013-05-05T19:56:37.000-04:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -43,11 +43,8 @@ Configuration
     * `assets_version`_
     * `assets_version_format`_
 * `profiler`_
-<<<<<<< HEAD
     * `collect`_
-=======
     * `enabled`_
->>>>>>> 2.2
 
 secret
 ~~~~~~
