Skip to content

Commit 9014f4f

Browse files
committed
fix: conflict resolving
2 parents 3dc1dd4 + 2dca804 commit 9014f4f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
imagekit-sdk (1.0.0)
4+
imagekitio-ruby (1.0.0)
55
carrierwave (>= 0.7, < 2.2)
66
rails (~> 5.2.0, >= 5.2.0)
77
rest-client (~> 2.1, >= 2.1)
@@ -169,7 +169,7 @@ PLATFORMS
169169
ruby
170170

171171
DEPENDENCIES
172-
imagekit-sdk!
172+
imagekitio-ruby!
173173
minitest (~> 5.0)
174174
rspec
175175

imagekit-sdk.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ require "imagekit/sdk/version"
55

66
# Describe your gem and declare its dependencies:
77
Gem::Specification.new do |spec|
8-
spec.name = "imagekit-sdk"
8+
spec.name = "imagekitio-ruby"
99
spec.version = Imagekit::Sdk::VERSION
10-
spec.authors = ["Imagekit.io"]
11-
spec.email = ["support@imagekit.io"]
10+
spec.authors = ["ImageKit.io team"]
11+
spec.email = ["developer@imagekit.io"]
1212
spec.homepage = "https://imagekit.io"
1313
spec.summary = "Automate image optimization on rails platforms."
1414
spec.description = "Automate image optimization on rails platforms."

0 commit comments

Comments
 (0)