Skip to content

Commit b4520fd

Browse files
committed
Sun Mar 17 12:38:53 MDT 2024
1 parent f553d26 commit b4520fd

File tree

235 files changed

+0
-3925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+0
-3925
lines changed

site/_site/2012/02/06/whats-jekyll/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ <h2>Related Posts</h2>
197197

198198
<li>
199199
<h3>
200-
<<<<<<< HEAD
201-
=======
202200
<a href="/2024/03/17/polyglot-1.8.0/">
203201
Polyglot 1.8.0 - Community Contributions Release
204202
<small>17 Mar 2024</small>
@@ -208,7 +206,6 @@ <h3>
208206

209207
<li>
210208
<h3>
211-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
212209
<a href="/2024/02/29/localized-variables/">
213210
Localized variables
214211
<small>29 Feb 2024</small>
@@ -225,18 +222,6 @@ <h3>
225222
</h3>
226223
</li>
227224

228-
<<<<<<< HEAD
229-
<li>
230-
<h3>
231-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
232-
Polyglot 1.6.0 and Simplified Chinese language support
233-
<small>08 Jun 2023</small>
234-
</a>
235-
</h3>
236-
</li>
237-
238-
=======
239-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
240225
</ul>
241226
</div>
242227

site/_site/2013/12/28/introducing-hyde/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ <h2>Related Posts</h2>
224224

225225
<li>
226226
<h3>
227-
<<<<<<< HEAD
228-
=======
229227
<a href="/2024/03/17/polyglot-1.8.0/">
230228
Polyglot 1.8.0 - Community Contributions Release
231229
<small>17 Mar 2024</small>
@@ -235,7 +233,6 @@ <h3>
235233

236234
<li>
237235
<h3>
238-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
239236
<a href="/2024/02/29/localized-variables/">
240237
Localized variables
241238
<small>29 Feb 2024</small>
@@ -252,18 +249,6 @@ <h3>
252249
</h3>
253250
</li>
254251

255-
<<<<<<< HEAD
256-
<li>
257-
<h3>
258-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
259-
Polyglot 1.6.0 and Simplified Chinese language support
260-
<small>08 Jun 2023</small>
261-
</a>
262-
</h3>
263-
</li>
264-
265-
=======
266-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
267252
</ul>
268253
</div>
269254

site/_site/2015/09/19/presenting-polyglot/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ <h2>Related Posts</h2>
238238

239239
<li>
240240
<h3>
241-
<<<<<<< HEAD
242-
=======
243241
<a href="/2024/03/17/polyglot-1.8.0/">
244242
Polyglot 1.8.0 - Community Contributions Release
245243
<small>17 Mar 2024</small>
@@ -249,7 +247,6 @@ <h3>
249247

250248
<li>
251249
<h3>
252-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
253250
<a href="/2024/02/29/localized-variables/">
254251
Localized variables
255252
<small>29 Feb 2024</small>
@@ -266,18 +263,6 @@ <h3>
266263
</h3>
267264
</li>
268265

269-
<<<<<<< HEAD
270-
<li>
271-
<h3>
272-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
273-
Polyglot 1.6.0 and Simplified Chinese language support
274-
<small>08 Jun 2023</small>
275-
</a>
276-
</h3>
277-
</li>
278-
279-
=======
280-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
281266
</ul>
282267
</div>
283268

site/_site/2015/11/14/polyglot-version-1-1/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ <h2>Related Posts</h2>
192192

193193
<li>
194194
<h3>
195-
<<<<<<< HEAD
196-
=======
197195
<a href="/2024/03/17/polyglot-1.8.0/">
198196
Polyglot 1.8.0 - Community Contributions Release
199197
<small>17 Mar 2024</small>
@@ -203,7 +201,6 @@ <h3>
203201

204202
<li>
205203
<h3>
206-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
207204
<a href="/2024/02/29/localized-variables/">
208205
Localized variables
209206
<small>29 Feb 2024</small>
@@ -220,18 +217,6 @@ <h3>
220217
</h3>
221218
</li>
222219

223-
<<<<<<< HEAD
224-
<li>
225-
<h3>
226-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
227-
Polyglot 1.6.0 and Simplified Chinese language support
228-
<small>08 Jun 2023</small>
229-
</a>
230-
</h3>
231-
</li>
232-
233-
=======
234-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
235220
</ul>
236221
</div>
237222

site/_site/2016/04/20/Polyglot-1.2.0/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ <h2>Related Posts</h2>
214214

215215
<li>
216216
<h3>
217-
<<<<<<< HEAD
218-
=======
219217
<a href="/2024/03/17/polyglot-1.8.0/">
220218
Polyglot 1.8.0 - Community Contributions Release
221219
<small>17 Mar 2024</small>
@@ -225,7 +223,6 @@ <h3>
225223

226224
<li>
227225
<h3>
228-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
229226
<a href="/2024/02/29/localized-variables/">
230227
Localized variables
231228
<small>29 Feb 2024</small>
@@ -242,18 +239,6 @@ <h3>
242239
</h3>
243240
</li>
244241

245-
<<<<<<< HEAD
246-
<li>
247-
<h3>
248-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
249-
Polyglot 1.6.0 and Simplified Chinese language support
250-
<small>08 Jun 2023</small>
251-
</a>
252-
</h3>
253-
</li>
254-
255-
=======
256-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
257242
</ul>
258243
</div>
259244

site/_site/2016/12/16/Polyglot-1.2.4/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ <h2>Related Posts</h2>
215215

216216
<li>
217217
<h3>
218-
<<<<<<< HEAD
219-
=======
220218
<a href="/2024/03/17/polyglot-1.8.0/">
221219
Polyglot 1.8.0 - Community Contributions Release
222220
<small>17 Mar 2024</small>
@@ -226,7 +224,6 @@ <h3>
226224

227225
<li>
228226
<h3>
229-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
230227
<a href="/2024/02/29/localized-variables/">
231228
Localized variables
232229
<small>29 Feb 2024</small>
@@ -243,18 +240,6 @@ <h3>
243240
</h3>
244241
</li>
245242

246-
<<<<<<< HEAD
247-
<li>
248-
<h3>
249-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
250-
Polyglot 1.6.0 and Simplified Chinese language support
251-
<small>08 Jun 2023</small>
252-
</a>
253-
</h3>
254-
</li>
255-
256-
=======
257-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
258243
</ul>
259244
</div>
260245

site/_site/2017/07/23/Polyglot-1.3.0/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ <h2>Related Posts</h2>
209209

210210
<li>
211211
<h3>
212-
<<<<<<< HEAD
213-
=======
214212
<a href="/2024/03/17/polyglot-1.8.0/">
215213
Polyglot 1.8.0 - Community Contributions Release
216214
<small>17 Mar 2024</small>
@@ -220,7 +218,6 @@ <h3>
220218

221219
<li>
222220
<h3>
223-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
224221
<a href="/2024/02/29/localized-variables/">
225222
Localized variables
226223
<small>29 Feb 2024</small>
@@ -237,18 +234,6 @@ <h3>
237234
</h3>
238235
</li>
239236

240-
<<<<<<< HEAD
241-
<li>
242-
<h3>
243-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
244-
Polyglot 1.6.0 and Simplified Chinese language support
245-
<small>08 Jun 2023</small>
246-
</a>
247-
</h3>
248-
</li>
249-
250-
=======
251-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
252237
</ul>
253238
</div>
254239

site/_site/2020/04/29/polyglot-1.3.2/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,6 @@ <h2>Related Posts</h2>
204204

205205
<li>
206206
<h3>
207-
<<<<<<< HEAD
208-
=======
209207
<a href="/2024/03/17/polyglot-1.8.0/">
210208
Polyglot 1.8.0 - Community Contributions Release
211209
<small>17 Mar 2024</small>
@@ -215,7 +213,6 @@ <h3>
215213

216214
<li>
217215
<h3>
218-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
219216
<a href="/2024/02/29/localized-variables/">
220217
Localized variables
221218
<small>29 Feb 2024</small>
@@ -232,18 +229,6 @@ <h3>
232229
</h3>
233230
</li>
234231

235-
<<<<<<< HEAD
236-
<li>
237-
<h3>
238-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
239-
Polyglot 1.6.0 and Simplified Chinese language support
240-
<small>08 Jun 2023</small>
241-
</a>
242-
</h3>
243-
</li>
244-
245-
=======
246-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
247232
</ul>
248233
</div>
249234

site/_site/2020/07/19/polyglot-1.3.3/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ <h2>Related Posts</h2>
196196

197197
<li>
198198
<h3>
199-
<<<<<<< HEAD
200-
=======
201199
<a href="/2024/03/17/polyglot-1.8.0/">
202200
Polyglot 1.8.0 - Community Contributions Release
203201
<small>17 Mar 2024</small>
@@ -207,7 +205,6 @@ <h3>
207205

208206
<li>
209207
<h3>
210-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
211208
<a href="/2024/02/29/localized-variables/">
212209
Localized variables
213210
<small>29 Feb 2024</small>
@@ -224,18 +221,6 @@ <h3>
224221
</h3>
225222
</li>
226223

227-
<<<<<<< HEAD
228-
<li>
229-
<h3>
230-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
231-
Polyglot 1.6.0 and Simplified Chinese language support
232-
<small>08 Jun 2023</small>
233-
</a>
234-
</h3>
235-
</li>
236-
237-
=======
238-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
239224
</ul>
240225
</div>
241226

site/_site/2021/02/07/polyglot-1.4.0/index.html

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ <h2>Related Posts</h2>
215215

216216
<li>
217217
<h3>
218-
<<<<<<< HEAD
219-
=======
220218
<a href="/2024/03/17/polyglot-1.8.0/">
221219
Polyglot 1.8.0 - Community Contributions Release
222220
<small>17 Mar 2024</small>
@@ -226,7 +224,6 @@ <h3>
226224

227225
<li>
228226
<h3>
229-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
230227
<a href="/2024/02/29/localized-variables/">
231228
Localized variables
232229
<small>29 Feb 2024</small>
@@ -243,18 +240,6 @@ <h3>
243240
</h3>
244241
</li>
245242

246-
<<<<<<< HEAD
247-
<li>
248-
<h3>
249-
<a href="/2023/06/08/polyglot-1.6.0-chinese-support/">
250-
Polyglot 1.6.0 and Simplified Chinese language support
251-
<small>08 Jun 2023</small>
252-
</a>
253-
</h3>
254-
</li>
255-
256-
=======
257-
>>>>>>> ba9f00d2dcbb499906ea221681d9a11fc05f0302
258243
</ul>
259244
</div>
260245

0 commit comments

Comments
 (0)