@@ -50,14 +50,6 @@ vendor/extensions/google_base public/stylesheets/google_base.css public/google_base.xml public/template_google_base.xml -<<<<<<< HEAD:.gitignore -vendor/extensions/css_themes -httpd -pgsql -public/stylesheets/product_reviews_ratings.* -vendor/extensions/product_reviews_ratings/ -======= ->>>>>>> a54e2ec8b35b521758134987b32f02063c867cf7:.gitignore coverage/* var TAGS .gitignore 87dbf98493359c076db573a30e298686878615d4 Steph Powell steph@endpoint.com http://github.com/akitaonrails/spree/commit/6f3006068ceffee4ee4f22ffea1dce7fb7d30dbb 6f3006068ceffee4ee4f22ffea1dce7fb7d30dbb 2009-04-24T20:04:48-07:00 2009-04-24T09:13:15-07:00 git ignore #2 cb33e5493f85117398ae5afa9e0f15722f1bc675 Sean Schofield schof@apache.org