Permalink
Browse files

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

  • Loading branch information...
1 parent 3e346a0 commit 20d0ec24028ec33c4ecd6d097277536284a16697 @jeffkreeftmeijer jeffkreeftmeijer committed Dec 2, 2009
Showing with 0 additions and 1 deletion.
  1. +0 −1 config/sprockets.yml
View
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
:default:
:asset_root: public
:load_path:

0 comments on commit 20d0ec2

Please sign in to comment.