Removed merge conflict

wouterj · wouterj · commit f8b82b7492e4 · 2014-05-10T12:23:26.000+02:00
diff --git a/bundles/tree_browser/introduction.rst b/bundles/tree_browser/introduction.rst
@@ -36,7 +36,6 @@ Both the CmfTreeBrowserBundle and FOSJsRoutingBundle_ must be registered in the
 
         return $bundles;
     }
->>>>>>> master
 
 Routing
 -------

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ Both the CmfTreeBrowserBundle and FOSJsRoutingBundle_ must be registered in the`
`36`	`36`
`37`	`37`	`return $bundles;`
`38`	`38`	`}`
`39`		`->>>>>>> master`
`40`	`39`
`41`	`40`	`Routing`
`42`	`41`	`-------`