Resolve merge conflict

This commit is contained in:
Steven Bazyl committed 2014-12-15 11:50:16 -08:00
commit ec670e9fa0
26 files changed
+52 -105

No files matched your search

-1
View File
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'signet', '~> 0.6'
s.add_runtime_dependency 'faraday', '~> 0.9'
s.add_runtime_dependency 'multi_json', '~> 1.10'
s.add_runtime_dependency 'uuidtools', "~> 2.1"
s.add_runtime_dependency 'autoparse', "~> 0.3"
s.add_runtime_dependency 'extlib', '~> 0.9'
s.add_runtime_dependency 'launchy', '~> 2.4'