onfleet-ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fece84d4f7da3846a285a32aa9855af9a5d6c96d
-  data.tar.gz: 9281bf345a8f2975f13aabc98db6e3b060819157
+  metadata.gz: 298c2c7a63d016fd61101c6c30229a3e7700868d
+  data.tar.gz: 285a8280869fe460c29561093272d7d4cb682169
 SHA512:
-  metadata.gz: deb95b4963efbff975a638f98c4bd547dc336835c037ba13c6ecf030c548a61026a23c128a4e9ef54571c8c23cb978db4bc3c53de91adda3e138e309aceba94f
-  data.tar.gz: 4a1e3962ed588954e29bafb0668d77149a6ca6a13c563efd386ee2696f12ee144109e2ddb2266dea36a1813a0d20796ca2ea74d1f556017642b611cabcb3690d
+  metadata.gz: 840dd631d9fe75349761d363dcf220f4829b49af17b40cd49abdabb1c775bfd271475217b730be4ae174467246c9142959ff853d3c746dd033bf7b478f965e45
+  data.tar.gz: 1b2c32961b36185eeaed57d7949c44950119b34a0c6799bb41d6324719b1c1aebe322e59f5cad0ccb4fd54a639d11eddc0019eee6036861438d5e84913aed97b

data/lib/onfleet-ruby.rb

@@ -20,10 +20,7 @@ require 'onfleet-ruby/actions/update'
 require 'onfleet-ruby/actions/get'
 require 'onfleet-ruby/actions/list'
 require 'onfleet-ruby/actions/delete'
-<<<<<<< HEAD
-=======
 require 'onfleet-ruby/actions/query_metadata'
->>>>>>> 5c063de65d354e63cb5ac4f7589fbb9c1ae99c5a
 
 # Resources
 require 'onfleet-ruby/onfleet_object'

data/onfleet-ruby.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'onfleet-ruby'
-  s.version     = '0.1.3'
-  s.date        = '2016-03-17'
+  s.version     = '0.1.4'
+  s.date        = '2016-04-08'
   s.summary     = "Onfleet ruby api"
   s.description = "To interact with Onfleet's API"
   s.authors     = ["Nick Wargnier"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onfleet-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Wargnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client