removed '<<<<<<< HEAD' from sprockets.yml

80beans · Dec 2, 2009 · 20d0ec2 · 20d0ec2
1 parent 3e346a0
commit 20d0ec2
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/config/sprockets.yml b/config/sprockets.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 :default:
   :asset_root: public
   :load_path: