8000 Fix merge conflict with stashed changes · morningfisho/codejam.github.io@cc713ab · GitHub
[go: up one dir, main page]
Skip to content

Commit cc713ab

Browse files
daviddarnesdaviddarnes
committed
Fix merge conflict with stashed changes
1 parent 4244e24 commit cc713ab

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

‎alembic-jekyll-theme.gemspec

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "alembic-jekyll-theme"
5-
<<<<<<< HEAD
6-
<<<<<<< Updated upstream
7-
spec.version = "3.1.0"
8-
=======
95
spec.version = "4.0.0"
10-
>>>>>>> Stashed changes
11-
=======
12-
spec.version = "3.2.0"
13-
>>>>>>> 6ac70934d8556fe3120cd2e5fdac936545602f8a
146
spec.authors = ["David Darnes"]
157
spec.email = ["me@daviddarnes.com"]
168

@@ -23,38 +15,14 @@ Gem::Specification.new do |spec|
2315

2416
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README|sw|manifest)}i) }
2517

26-
<<<<<<< HEAD
27-
<<<<<<< Updated upstream
28-
spec.add_runtime_dependency "jekyll", "~> 3.8"
29-
spec.add_runtime_dependency "jekyll-sitemap", "~> 0.13"
30-
spec.add_runtime_dependency "jekyll-mentions", "~> 1.2"
31-
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
32-
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.3"
33-
spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.12"
34-
spec.add_runtime_dependency "jekyll-default-layout", "~> 0.1"
35-
spec.add_runtime_dependency "jekyll-feed", "~> 0.9"
36-
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.2"
37-
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.1"
38-
spec.add_runtime_dependency "jemoji", "~> 0.11"
39-
=======
40-
=======
41-
>>>>>>> 6ac70934d8556fe3120cd2e5fdac936545602f8a
4218
spec.add_runtime_dependency "jekyll", "~> 4.1"
4319
spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4.0"
4420
spec.add_runtime_dependency "jekyll-mentions", "~> 1.6.0"
4521
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1.0"
4622
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.6.1"
4723
spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.16"
48-
<<<<<<< HEAD
49-
=======
50-
spec.add_runtime_dependency "jekyll-default-layout", "~> 0.1.4"
51-
>>>>>>> 6ac70934d8556fe3120cd2e5fdac936545602f8a
5224
spec.add_runtime_dependency "jekyll-feed", "~> 0.15"
5325
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.3.1"
5426
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.2"
5527
spec.add_runtime_dependency "jemoji", "~> 0.12"
56-
<<<<<<< HEAD
57-
>>>>>>> Stashed changes
58-
=======
59-
>>>>>>> 6ac70934d8556fe3120cd2e5fdac936545602f8a
6028
end

0 commit comments

Comments
 (0)
0