Merge branch 'master' of github.com:envygeeks/pry-vterm_aliases

envygeeks · Mar 3, 2013 · f4bf58a · f4bf58a
2 parents c1b48f7 + d92e9d3
commit f4bf58a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 75 deletions.
diff --git a/lib/pry-vterm_aliases.rb b/lib/pry-vterm_aliases.rb
diff --git a/pry-vterm_aliases.gemspec b/pry-vterm_aliases.gemspec
@@ -8,7 +8,12 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.add_dependency("pry")
   s.require_paths = ["lib"]
+<<<<<<< HEAD
   s.add_development_dependency("rspec", "~> 2.13")
+=======
+  s.add_dependency("pry", "~> 0.9.12")
+  s.add_development_dependency("rspec", "~> 2.12.0")
+>>>>>>> d92e9d3d22456e4a7a7d6dd59a61e123a1939eda
   s.summary = "Enable your Bash and ZSH alises in Pry."
   s.description = "Enable your Bash and ZSH alises in Pry shell."
   s.homepage = "http://envygeeks.com/projects/pry-vterm_aliases/"