Skip to content

Commit 030c884

Browse files
ScholarusScholarus
committed
Finally fixed i think
1 parent b9e96e5 commit 030c884

3 files changed

Lines changed: 35 additions & 139 deletions

File tree

‎Gemfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# frozen_string_literal: true
2-
3-
source "https://rubygems.org"
4-
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
55
gem "jekyll"

‎Gemfile.lock‎

Lines changed: 30 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,82 @@
1-
<<<<<<< HEAD
2-
GEM
3-
remote: https://rubygems.org/
4-
specs:
5-
addressable (2.8.7)
6-
public_suffix (>= 2.0.2, < 7.0)
7-
bigdecimal (3.1.9)
8-
colorator (1.1.0)
9-
concurrent-ruby (1.3.4)
10-
em-websocket (0.5.3)
11-
eventmachine (>= 0.12.9)
12-
http_parser.rb (~> 0)
13-
eventmachine (1.2.7)
14-
ffi (1.17.1)
15-
ffi (1.17.1-x86_64-linux-gnu)
16-
forwardable-extended (2.6.0)
17-
google-protobuf (4.29.3)
18-
bigdecimal
19-
rake (>= 13)
20-
google-protobuf (4.29.3-x86_64-linux)
21-
bigdecimal
22-
rake (>= 13)
23-
http_parser.rb (0.8.0)
24-
i18n (1.14.6)
25-
concurrent-ruby (~> 1.0)
26-
jekyll (4.3.4)
27-
addressable (~> 2.4)
28-
colorator (~> 1.0)
29-
em-websocket (~> 0.5)
30-
i18n (~> 1.0)
31-
jekyll-sass-converter (>= 2.0, < 4.0)
32-
jekyll-watch (~> 2.0)
33-
kramdown (~> 2.3, >= 2.3.1)
34-
kramdown-parser-gfm (~> 1.0)
35-
liquid (~> 4.0)
36-
mercenary (>= 0.3.6, < 0.5)
37-
pathutil (~> 0.9)
38-
rouge (>= 3.0, < 5.0)
39-
safe_yaml (~> 1.0)
40-
terminal-table (>= 1.8, < 4.0)
41-
webrick (~> 1.7)
42-
jekyll-sass-converter (3.0.0)
43-
sass-embedded (~> 1.54)
44-
jekyll-watch (2.2.1)
45-
listen (~> 3.0)
46-
kramdown (2.5.1)
47-
rexml (>= 3.3.9)
48-
kramdown-parser-gfm (1.1.0)
49-
kramdown (~> 2.0)
50-
liquid (4.0.4)
51-
listen (3.9.0)
52-
rb-fsevent (~> 0.10, >= 0.10.3)
53-
rb-inotify (~> 0.9, >= 0.9.10)
54-
mercenary (0.4.0)
55-
pathutil (0.16.2)
56-
forwardable-extended (~> 2.6)
57-
public_suffix (6.0.1)
58-
rake (13.2.1)
59-
rb-fsevent (0.11.2)
60-
rb-inotify (0.11.1)
61-
ffi (~> 1.0)
62-
rexml (3.4.0)
63-
rouge (4.5.1)
64-
safe_yaml (1.0.5)
65-
sass-embedded (1.83.1)
66-
google-protobuf (~> 4.29)
67-
rake (>= 13)
68-
sass-embedded (1.83.1-x86_64-linux-gnu)
69-
google-protobuf (~> 4.29)
70-
terminal-table (3.0.2)
71-
unicode-display_width (>= 1.1.1, < 3)
72-
unicode-display_width (2.6.0)
73-
webrick (1.9.1)
74-
75-
PLATFORMS
76-
ruby
77-
x86_64-linux
78-
79-
DEPENDENCIES
80-
jekyll
81-
82-
BUNDLED WITH
83-
2.6.0
84-
=======
851
GEM
862
remote: https://rubygems.org/
873
specs:
88-
addressable (2.8.8)
89-
public_suffix (>= 2.0.2, < 8.0)
90-
base64 (0.3.0)
91-
bigdecimal (4.0.1)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
bigdecimal (3.1.9)
927
colorator (1.1.0)
93-
concurrent-ruby (1.3.6)
94-
csv (3.3.5)
8+
concurrent-ruby (1.3.4)
959
em-websocket (0.5.3)
9610
eventmachine (>= 0.12.9)
9711
http_parser.rb (~> 0)
9812
eventmachine (1.2.7)
99-
ffi (1.17.3)
13+
ffi (1.17.1)
14+
ffi (1.17.1-x86_64-linux-gnu)
10015
forwardable-extended (2.6.0)
101-
google-protobuf (4.33.4)
16+
google-protobuf (4.29.3)
10217
bigdecimal
10318
rake (>= 13)
104-
http_parser.rb (0.8.1)
105-
i18n (1.14.8)
19+
google-protobuf (4.29.3-x86_64-linux)
20+
bigdecimal
21+
rake (>= 13)
22+
http_parser.rb (0.8.0)
23+
i18n (1.14.6)
10624
concurrent-ruby (~> 1.0)
107-
jekyll (4.4.1)
25+
jekyll (4.3.4)
10826
addressable (~> 2.4)
109-
base64 (~> 0.2)
11027
colorator (~> 1.0)
111-
csv (~> 3.0)
11228
em-websocket (~> 0.5)
11329
i18n (~> 1.0)
11430
jekyll-sass-converter (>= 2.0, < 4.0)
11531
jekyll-watch (~> 2.0)
116-
json (~> 2.6)
11732
kramdown (~> 2.3, >= 2.3.1)
11833
kramdown-parser-gfm (~> 1.0)
11934
liquid (~> 4.0)
120-
mercenary (~> 0.3, >= 0.3.6)
35+
mercenary (>= 0.3.6, < 0.5)
12136
pathutil (~> 0.9)
12237
rouge (>= 3.0, < 5.0)
12338
safe_yaml (~> 1.0)
12439
terminal-table (>= 1.8, < 4.0)
12540
webrick (~> 1.7)
126-
jekyll-sass-converter (3.1.0)
127-
sass-embedded (~> 1.75)
41+
jekyll-sass-converter (3.0.0)
42+
sass-embedded (~> 1.54)
12843
jekyll-watch (2.2.1)
12944
listen (~> 3.0)
130-
json (2.18.0)
131-
kramdown (2.5.2)
132-
rexml (>= 3.4.4)
45+
kramdown (2.5.1)
46+
rexml (>= 3.3.9)
13347
kramdown-parser-gfm (1.1.0)
13448
kramdown (~> 2.0)
13549
liquid (4.0.4)
136-
listen (3.10.0)
137-
logger
50+
listen (3.9.0)
13851
rb-fsevent (~> 0.10, >= 0.10.3)
13952
rb-inotify (~> 0.9, >= 0.9.10)
140-
logger (1.7.0)
14153
mercenary (0.4.0)
14254
pathutil (0.16.2)
14355
forwardable-extended (~> 2.6)
144-
public_suffix (7.0.2)
145-
rake (13.3.1)
56+
public_suffix (6.0.1)
57+
rake (13.2.1)
14658
rb-fsevent (0.11.2)
14759
rb-inotify (0.11.1)
14860
ffi (~> 1.0)
149-
rexml (3.4.4)
150-
rouge (4.7.0)
61+
rexml (3.4.0)
62+
rouge (4.5.1)
15163
safe_yaml (1.0.5)
152-
sass-embedded (1.97.2)
153-
google-protobuf (~> 4.31)
64+
sass-embedded (1.83.1)
65+
google-protobuf (~> 4.29)
15466
rake (>= 13)
67+
sass-embedded (1.83.1-x86_64-linux-gnu)
68+
google-protobuf (~> 4.29)
15569
terminal-table (3.0.2)
15670
unicode-display_width (>= 1.1.1, < 3)
15771
unicode-display_width (2.6.0)
158-
webrick (1.9.2)
72+
webrick (1.9.1)
15973

16074
PLATFORMS
16175
ruby
76+
x86_64-linux
16277

16378
DEPENDENCIES
16479
jekyll
16580

16681
BUNDLED WITH
167-
2.6.9
168-
>>>>>>> 64dd128063fdc852d931e29091e967773f63b6fb
82+
2.6.0

‎_redirects‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
/sponsor /assets/birminghack-sponsorship-proposal.pdf
4-
/privacy /privacy-policy
5-
/conduct /code-of-conduct
6-
/coc /code-of-conduct
7-
/tickets https://ti.to/birminghack/1
8-
/discord https://discord.gg/uAzrWQN7UM
9-
/feedback https://docs.google.com/forms/d/e/1FAIpQLSfLJFBPUlhiDxJth5Ud2xF5zlRJ9XL0GGryJ8DyIj02gX-Pnw/viewform?usp=dialog
10-
=======
11-
/sponsor /assets/birminghack-sponsorship-proposal.pdf
12-
/privacy /privacy-policy
13-
/conduct /code-of-conduct
14-
/coc /code-of-conduct
15-
/tickets https://ti.to/birminghack/1
16-
/discord https://discord.gg/uAzrWQN7UM
17-
>>>>>>> 2563a2b (Revert "Add redirect for feedback")
18-
=======
191
/sponsor /assets/birminghack-sponsorship-proposal.pdf
202
/privacy /privacy-policy
213
/conduct /code-of-conduct
224
/coc /code-of-conduct
235
/tickets https://ti.to/birminghack/1
246
/discord https://discord.gg/uAzrWQN7UM
257
/feedback https://docs.google.com/forms/d/e/1FAIpQLSfLJFBPUlhiDxJth5Ud2xF5zlRJ9XL0GGryJ8DyIj02gX-Pnw/viewform?usp=dialog
26-
>>>>>>> da78298 (Reapply "Add redirect for feedback")
8+

0 commit comments

Comments
 (0)