Permalink
Browse files

merge

  • Loading branch information...
2 parents a03671f + 429d163 commit 3b73d42dbb75cc1d947793d60f8cd21c11beedbd @pghodgman committed Sep 15, 2013
Showing with 23 additions and 0 deletions.
  1. +19 −0 .gitignore
  2. +4 −0 README.md
View
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
@@ -14,3 +15,21 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+=======
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.rspec
+/.bundle
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html
+>>>>>>> 429d16319afe98f01beae856ae50ab44e5fd1933
View
@@ -0,0 +1,4 @@
+osprey-model
+============
+
+osprey-model prototype

0 comments on commit 3b73d42

Please sign in to comment.