Browse files

removing Gemfile.lock from project and put .gitignore on it

  • Loading branch information...
1 parent a148d81 commit 0c309cdaa2dc39b65f14317a9c93c7553771b52b @jedi4ever jedi4ever committed Nov 25, 2011
Showing with 1 addition and 143 deletions.
  1. +1 −0 .gitignore
  2. +0 −143 Gemfile.lock
View
1 .gitignore
@@ -1,5 +1,6 @@
.DS_Store
.bundle
+Gemfile.lock
gems/*
iso/*
iso
View
143 Gemfile.lock
@@ -1,143 +0,0 @@
-PATH
- remote: .
- specs:
-<<<<<<< HEAD
- veewee (0.3.0.alpha4)
- CFPropertyList (~> 2.0.17)
- ansi (~> 1.3.0)
-=======
- veewee (0.2.1)
->>>>>>> master
- cucumber (~> 1.0.2)
- fog (~> 1.0.0)
- highline (~> 1.6.1)
- i18n
- net-ssh (~> 2.1.0)
- popen4 (~> 0.1.2)
- progressbar
-<<<<<<< HEAD
- rspec (~> 2.5.0)
- ruby-vnc (~> 1.0.0)
-=======
- rspec (~> 2.5)
->>>>>>> master
- thor (~> 0.14.6)
- vagrant (~> 0.8.2)
-
-GEM
- remote: http://rubygems.org/
- specs:
- CFPropertyList (2.0.17)
- libxml-ruby (>= 1.1.0)
- rake (>= 0.7.0)
- Platform (0.4.0)
- ansi (1.3.0)
- archive-tar-minitar (0.5.2)
- builder (3.0.0)
- cucumber (1.0.6)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.4.18)
- json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
- diff-lcs (1.1.3)
- erubis (2.7.0)
-<<<<<<< HEAD
- excon (0.7.6)
- ffi (1.0.9)
- fog (1.0.0)
- builder
- excon (~> 0.7.3)
- formatador (~> 0.2.0)
- mime-types
- multi_json (~> 1.0.3)
- net-scp (~> 1.0.4)
- net-ssh (~> 2.1.4)
- nokogiri (~> 1.5.0)
- ruby-hmac
- formatador (0.2.1)
- gherkin (2.4.21)
- json (>= 1.4.6)
- highline (1.6.2)
- i18n (0.6.0)
- json (1.5.4)
- libxml-ruby (2.2.2)
- mime-types (1.16)
- multi_json (1.0.3)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-ssh (2.1.4)
- nokogiri (1.5.0)
- open4 (1.2.0)
-=======
- ffi (1.0.11)
- gherkin (2.4.21)
- json (>= 1.4.6)
- highline (1.6.8)
- i18n (0.6.0)
- json (1.5.4)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-ssh (2.1.4)
- open4 (1.3.0)
->>>>>>> master
- popen4 (0.1.2)
- Platform (>= 0.4.0)
- open4 (>= 0.4.0)
-<<<<<<< HEAD
- progressbar (0.9.1)
-<<<<<<< HEAD
- rake (0.9.2)
- rspec (2.5.0)
- rspec-core (~> 2.5.0)
- rspec-expectations (~> 2.5.0)
- rspec-mocks (~> 2.5.0)
- rspec-core (2.5.2)
- rspec-expectations (2.5.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.5.0)
- ruby-hmac (0.4.0)
- ruby-vnc (1.0.1)
- term-ansicolor (1.0.6)
-=======
-=======
- progressbar (0.9.2)
- rake (0.9.2.2)
->>>>>>> master
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- term-ansicolor (1.0.7)
->>>>>>> master
- thor (0.14.6)
- vagrant (0.8.7)
- archive-tar-minitar (= 0.5.2)
- erubis (~> 2.7.0)
- i18n (~> 0.6.0)
- json (~> 1.5.1)
- net-scp (~> 1.0.4)
- net-ssh (~> 2.1.4)
- thor (~> 0.14.6)
- virtualbox (~> 0.9.1)
- virtualbox (0.9.2)
- ffi (~> 1.0.9)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- bundler (>= 1.0.0)
-<<<<<<< HEAD
-<<<<<<< HEAD
- rake
-=======
->>>>>>> master
-=======
- rake
->>>>>>> master
- veewee!

0 comments on commit 0c309cd

Please sign in to comment.