unix_commander 0.1.1 → 0.1.2

data/README.md

@@ -34,8 +34,6 @@ comm = UnixCommander::Command.new
 comm.cat("file").tail("-n10").grep("'something'").run
 ```
 
-<<<<<<< HEAD
-=======
 You can use redirection too
 ```
 require 'unix_commander'
@@ -67,13 +65,10 @@ require 'unix_commander'
 comm = UnixCommander::Command.new
 comm.cat("file").tail("-n10").grep("'something'").run_ssh("Batou99","secret","remote_server")
 ```
-<<<<<<< HEAD
-=======
 
 After running a command you can access it output using **out**, **err** or **both**
 ```
 require 'unix_commander'
->>>>>>> development
 
 comm = UnixCommander::Command.new
 comm.cat("file").tail("-n10").grep("'something'").run_ssh("Batou99","secret","remote_server").out

data/lib/unix_commander/version.rb

@@ -1,3 +1,3 @@
 module UnixCommander
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unix_commander
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: