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

Commit ae419b7

Browse files
daviddarnesdaviddarnes
committed
Fix merge conflict with stashed changes
1 parent a7537cc commit ae419b7

File tree

5 files changed

+35
-2
lines changed

5 files changed

+35
-2
lines changed

‎_config.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ plugins:
2929
- jekyll-paginate
3030
- jekyll-seo-tag
3131
- jekyll-redirect-from
32-
- jekyll-default-layout
3332
- jekyll-feed
3433
- jekyll-commonmark
3534
- jekyll-include-cache
@@ -78,6 +77,21 @@ defaults:
7877
path: ""
7978
values:
8079
image: "/assets/default-social-image.png" # Default image for sharing
80+
<<<<<<< Updated upstream
81+
=======
82+
-
83+
scope:
84+
path: ""
85+
type: "posts"
86+
values:
87+
layout: post # Set the default layout for posts
88+
-
89+
scope:
90+
path: ""
91+
type: "pages"
92+
values:
93+
layout: page # Set the default layout for pages
94+
>>>>>>> Stashed changes
8195

8296
# 7. Site settings
8397
encoding: utf-8 # Make sure the encoding is right

‎alembic-jekyll-theme.gemspec

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

33
Gem::Specification.new do |spec|
44
spec.name = "alembic-jekyll-theme"
5+
<<<<<<< Updated upstream
56
spec.version = "3.1.0"
7+
=======
8+
spec.version = "4.0.0"
9+
>>>>>>> Stashed changes
610
spec.authors = ["David Darnes"]
711
spec.email = ["me@daviddarnes.com"]
812

@@ -15,6 +19,7 @@ Gem::Specification.new do |spec|
1519

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

22+
<<<<<<< Updated upstream
1823
spec.add_runtime_dependency "jekyll", "~> 3.8"
1924
spec.add_runtime_dependency "jekyll-sitemap", "~> 0.13"
2025
spec.add_runtime_dependency "jekyll-mentions", "~> 1.2"
@@ -26,4 +31,16 @@ Gem::Specification.new do |spec|
2631
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.2"
2732
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.1"
2833
spec.add_runtime_dependency "jemoji", "~> 0.11"
34+
=======
35+
spec.add_runtime_dependency "jekyll", "~> 4.1"
36+
spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4.0"
37+
spec.add_runtime_dependency "jekyll-mentions", "~> 1.6.0"
38+
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1.0"
39+
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.6.1"
40+
spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.16"
41+
spec.add_runtime_dependency "jekyll-feed", "~> 0.15"
42+
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.3.1"
43+
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.2"
44+
spec.add_runtime_dependency "jemoji", "~> 0.12"
45+
>>>>>>> Stashed changes
2946
end

‎assets/manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
permalink: "manifest.json"
33
layout: null
4+
sitemap: false
45
---
56
{
67
"lang": "{{ site.lang | default: "en-US" }}",

‎assets/scripts/sw.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
22
permalink: "/sw.js"
33
layout: null
4+
sitemap: false
45
---
6+
57
const version = '{{ site.time | date: '%Y%m%d%H%M%S' }}';
68
const cacheName = `static::${version}`;
79

‎index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ feature_text: |
55
A Jekyll boilerplate theme designed to be a starting point for any Jekyll website
66
feature_image: "https://picsum.photos/1300/400?image=989"
77
excerpt: "Alembic is a starting point for [Jekyll](https://jekyllrb.com/) projects. Rather than starting from scratch, this boilerplate is designed to get the ball rolling immediately. Install it, configure it, tweak it, push it."
8-
layout: page
98
---
109

1110
Alembic is a starting point for [Jekyll](https://jekyllrb.com/) projects. Rather than starting from scratch, this boilerplate is designed to get the ball rolling immediately. Install it, configure it, tweak it, push it.

0 commit comments

Comments
 (0)
0