flydata 0.0.3.1 → 0.0.3.2

data/VERSION

@@ -1 +1 @@
-0.0.3.1
+0.0.3.2

data/flydata.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.3.1"
+  s.version = "0.0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]

data/lib/flydata/command/setup.rb

@@ -95,8 +95,6 @@ module Flydata
           newline
         end
         create_log_entry(path)
-<<<<<<< HEAD
-=======
       end
       def build_recommended_entries
         path_options=[]
@@ -149,7 +147,6 @@ module Flydata
           end
         end
         create_log_entry(path)
->>>>>>> feature/auto_scan_logs
       end
       def ask_log_deletion(path)
         unless File.writable?(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2228403255731141406
+      hash: -1337540229857680230
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: