Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Restored gemfile lock

  • Loading branch information...
commit 7190c00845c87543452d8a31632f0366a56cabf1 1 parent f07ae8e
@jseidl authored
Showing with 0 additions and 25 deletions.
  1. +0 −25 Gemfile.lock
View
25 Gemfile.lock
@@ -1,30 +1,6 @@
GEM
remote: http://rubygems.org/
specs:
-<<<<<<< HEAD
- awesome_print (0.4.0)
- bson (1.3.1)
- bson (1.3.1-java)
- bunny (0.6.0)
- daemons (1.1.3)
- eventmachine (0.12.10)
- eventmachine (0.12.10-java)
- ffi (1.0.9)
- ffi (1.0.9-java)
- filewatch (0.2.5)
- ffi
- gelf (1.1.3)
- json
- haml (3.1.2)
- hoe (2.9.4)
- rake (>= 0.8.7)
- jls-grok (0.4.7)
- ffi (>= 0.6.3)
- jruby-elasticsearch (0.0.9)
- json (1.5.1)
- json (1.5.1-java)
- mizuno (0.4.0)
-=======
awesome_print (1.0.2)
bouncy-castle-java (1.5.0146.1)
bson (1.5.2)
@@ -56,7 +32,6 @@ GEM
childprocess (>= 0.2.6)
choice (>= 0.1.0)
ffi (>= 1.0.0)
->>>>>>> logstash/master
rack (>= 1.0.0)
mongo (1.5.2)
bson (= 1.5.2)
Please sign in to comment.
Something went wrong with that request. Please try again.