excluding sublime project files from git

wrburgess · May 12, 2013 · 05dfe32 · 05dfe32
1 parent fb9efde
commit 05dfe32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ log
 _yardoc
 .DS_Store
 .env
+*.sublime-project
+*.sublime-workspace
diff --git a/Gemfile b/Gemfile
@@ -6,8 +6,7 @@ gem 'rails', '3.2.13'
 gem 'activeadmin', '0.6.0'
 gem 'active_model_serializers', '0.8.1'
 gem 'json', '1.7.7'
-gem 'meta_search', '1.1.3'
-gem 'newrelic_rpm', '3.6.2.96'
+gem 'meta_search', '1.1.3'gem 'newrelic_rpm', '3.6.2.96'
 gem 'pg', '0.15.1'
 gem 'settingslogic', '2.0.9'
 gem 'unicorn', '4.6.2'

diff --git a/spec/models/ingredient_spec.rb b/spec/models/ingredient_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+
 
 describe Ingredient do
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		require 'spec_helper'


		describe Ingredient do

Expand Down