Permalink
Browse files

Merge remote-tracking branch 'Kelsin/regular-expressions'

Conflicts:
	lib/guard/jammit/templates/Guardfile
  • Loading branch information...
2 parents 87b2b8f + 8b9ebe4 commit abeb2a138827a59b52ecb674317c54598b48b52e @netzpirat netzpirat committed Jan 8, 2012
Showing with 5 additions and 0 deletions.
  1. +5 −0 lib/guard/jammit/templates/Guardfile
@@ -1,4 +1,9 @@
guard 'jammit' do
+<<<<<<< HEAD
watch(/^public\/javascripts\/(.*)\.js/)
watch(/^public\/stylesheets\/(.*)\.css/)
+=======
+ watch(%r{^public/javascripts/(.*)\.js$})
+ watch(%r{^public/stylesheets/(.*)\.css$})
+>>>>>>> Kelsin/regular-expressions
end

0 comments on commit abeb2a1

Please sign in to comment.