flydata 0.0.3.1 → 0.0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.3.1
1
+ 0.0.3.2
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "flydata"
8
- s.version = "0.0.3.1"
8
+ s.version = "0.0.3.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Koichi Fujikawa"]
@@ -95,8 +95,6 @@ module Flydata
95
95
  newline
96
96
  end
97
97
  create_log_entry(path)
98
- <<<<<<< HEAD
99
- =======
100
98
  end
101
99
  def build_recommended_entries
102
100
  path_options=[]
@@ -149,7 +147,6 @@ module Flydata
149
147
  end
150
148
  end
151
149
  create_log_entry(path)
152
- >>>>>>> feature/auto_scan_logs
153
150
  end
154
151
  def ask_log_deletion(path)
155
152
  unless File.writable?(path)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flydata
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3.1
4
+ version: 0.0.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
275
275
  version: '0'
276
276
  segments:
277
277
  - 0
278
- hash: -2228403255731141406
278
+ hash: -1337540229857680230
279
279
  required_rubygems_version: !ruby/object:Gem::Requirement
280
280
  none: false
281
281
  requirements: