Skip to content

Commit f7f1d17

Browse files
abhiramrabhiramr
committed
Fixing merges
2 parents e822899 + 3c777a0 commit f7f1d17

File tree

80 files changed

+1621
-483
lines changed

Some content is hidden

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

80 files changed

+1621
-483
lines changed

‎404.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore </title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -31,8 +31,7 @@
3131
<meta property="og:url" content="https://brokebibliophiles.github.io/404.html" />
3232

3333
<meta itemprop="name" content="404 Page not found">
34-
<meta itemprop="description" content="Your friendly neighborhood book club">
35-
<meta name="twitter:card" content="summary"/>
34+
<meta itemprop="description" content="Your friendly neighborhood book club"><meta name="twitter:card" content="summary"/>
3635
<meta name="twitter:title" content="404 Page not found"/>
3736
<meta name="twitter:description" content="Your friendly neighborhood book club"/>
3837

‎about/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore | About Us</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -36,8 +36,7 @@
3636
<meta property="og:url" content="https://brokebibliophiles.github.io/about/" />
3737

3838
<meta itemprop="name" content="About Us">
39-
<meta itemprop="description" content="Your friendly neighborhood book club :) ">
40-
<meta name="twitter:card" content="summary"/>
39+
<meta itemprop="description" content="Your friendly neighborhood book club :) "><meta name="twitter:card" content="summary"/>
4140
<meta name="twitter:title" content="About Us"/>
4241
<meta name="twitter:description" content="Your friendly neighborhood book club :) "/>
4342

‎categories/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore </title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -36,8 +36,7 @@
3636
<meta property="og:url" content="https://brokebibliophiles.github.io/categories/" />
3737

3838
<meta itemprop="name" content="Categories">
39-
<meta itemprop="description" content="Your friendly neighborhood book club">
40-
<meta name="twitter:card" content="summary"/>
39+
<meta itemprop="description" content="Your friendly neighborhood book club"><meta name="twitter:card" content="summary"/>
4140
<meta name="twitter:title" content="Categories"/>
4241
<meta name="twitter:description" content="Your friendly neighborhood book club"/>
4342

‎contact/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore | Contact</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -37,8 +37,7 @@
3737

3838

3939

40-
<meta itemprop="keywords" content="" />
41-
<meta name="twitter:card" content="summary"/>
40+
<meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
4241
<meta name="twitter:title" content="Contact"/>
4342
<meta name="twitter:description" content="We&#39;d love to hear from you"/>
4443

‎index.html

+62-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore </title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -34,10 +34,13 @@
3434
<meta property="og:description" content=" " />
3535
<meta property="og:type" content="website" />
3636
<meta property="og:url" content="https://brokebibliophiles.github.io/" />
37+
<<<<<<< HEAD
3738
<meta property="og:updated_time" content="2022-07-31T15:07:30+05:30" />
39+
=======
40+
<meta property="og:updated_time" content="2022-06-26T15:07:30+05:30" />
41+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
3842
<meta itemprop="name" content="">
39-
<meta itemprop="description" content=" ">
40-
<meta name="twitter:card" content="summary"/>
43+
<meta itemprop="description" content=" "><meta name="twitter:card" content="summary"/>
4144
<meta name="twitter:title" content=""/>
4245
<meta name="twitter:description" content=" "/>
4346

@@ -190,6 +193,7 @@ <h1 class="flex-none">
190193

191194
<div class="blah w-100">
192195
<h1 class="f3 fw1 athelas mt0 lh-title">
196+
<<<<<<< HEAD
193197
<a href="https://brokebibliophiles.github.io/post/2022-07-31-bbb-meetup-50/" class="color-inherit dim link">
194198
BBB Meetup-50
195199
</a>
@@ -199,6 +203,17 @@ <h1 class="f3 fw1 athelas mt0 lh-title">
199203
The entire list of books discussed can be found here.
200204
</div>
201205
<a href="https://brokebibliophiles.github.io/post/2022-07-31-bbb-meetup-50/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
206+
=======
207+
<a href="https://brokebibliophiles.github.io/post/2022-06-26-bbb-meetup-49/" class="color-inherit dim link">
208+
BBB Meetup-49
209+
</a>
210+
</h1>
211+
<div class="f6 f5-l lh-copy nested-copy-line-height nested-links">
212+
The 49th meetup of BBB happened on the 26th of Jun 2022.
213+
The entire list of books discussed can be found here.
214+
</div>
215+
<a href="https://brokebibliophiles.github.io/post/2022-06-26-bbb-meetup-49/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
216+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
202217

203218
</div>
204219
</div>
@@ -215,6 +230,7 @@ <h1 class="f3 fw1 athelas mt0 lh-title">
215230

216231
<div class="blah w-100">
217232
<h1 class="f3 fw1 athelas mt0 lh-title">
233+
<<<<<<< HEAD
218234
<a href="https://brokebibliophiles.github.io/post/2022-06-26-bbb-meetup-49/" class="color-inherit dim link">
219235
BBB Meetup-49
220236
</a>
@@ -224,6 +240,17 @@ <h1 class="f3 fw1 athelas mt0 lh-title">
224240
The entire list of books discussed can be found here.
225241
</div>
226242
<a href="https://brokebibliophiles.github.io/post/2022-06-26-bbb-meetup-49/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
243+
=======
244+
<a href="https://brokebibliophiles.github.io/post/2022-05-22-bbb-meetup-48/" class="color-inherit dim link">
245+
BBB Meetup-48
246+
</a>
247+
</h1>
248+
<div class="f6 f5-l lh-copy nested-copy-line-height nested-links">
249+
The 48th meetup of BBB happened on the 22nd of May 2022.
250+
The entire list of books discussed can be found here.
251+
</div>
252+
<a href="https://brokebibliophiles.github.io/post/2022-05-22-bbb-meetup-48/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
253+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
227254

228255
</div>
229256
</div>
@@ -240,6 +267,7 @@ <h1 class="f3 fw1 athelas mt0 lh-title">
240267

241268
<div class="blah w-100">
242269
<h1 class="f3 fw1 athelas mt0 lh-title">
270+
<<<<<<< HEAD
243271
<a href="https://brokebibliophiles.github.io/post/2022-05-22-bbb-meetup-48/" class="color-inherit dim link">
244272
BBB Meetup-48
245273
</a>
@@ -249,6 +277,17 @@ <h1 class="f3 fw1 athelas mt0 lh-title">
249277
The entire list of books discussed can be found here.
250278
</div>
251279
<a href="https://brokebibliophiles.github.io/post/2022-05-22-bbb-meetup-48/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
280+
=======
281+
<a href="https://brokebibliophiles.github.io/post/2022-03-27-bbb-meetup-47/" class="color-inherit dim link">
282+
BBB Meetup-47
283+
</a>
284+
</h1>
285+
<div class="f6 f5-l lh-copy nested-copy-line-height nested-links">
286+
The 47th meetup of BBB happened on the 27th of March 2022.
287+
The entire list of books discussed can be found here.
288+
</div>
289+
<a href="https://brokebibliophiles.github.io/post/2022-03-27-bbb-meetup-47/" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">read more</a>
290+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
252291

253292
</div>
254293
</div>
@@ -265,26 +304,46 @@ <h1 class="f3">More</h1>
265304

266305

267306
<h2 class="f5 fw4 mb4 dib mr3">
307+
<<<<<<< HEAD
268308
<a href="https://brokebibliophiles.github.io/post/2022-03-27-bbb-meetup-47/" class="link black dim">
269309
BBB Meetup-47
310+
=======
311+
<a href="https://brokebibliophiles.github.io/post/2022-02-27-bbb-meetup-46/" class="link black dim">
312+
BBB Meetup-46
313+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
270314
</a>
271315
</h2>
272316

273317
<h2 class="f5 fw4 mb4 dib mr3">
318+
<<<<<<< HEAD
274319
<a href="https://brokebibliophiles.github.io/post/2022-02-27-bbb-meetup-46/" class="link black dim">
275320
BBB Meetup-46
321+
=======
322+
<a href="https://brokebibliophiles.github.io/post/2022-02-25-bbb-meetup-45/" class="link black dim">
323+
BBB Meetup-45
324+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
276325
</a>
277326
</h2>
278327

279328
<h2 class="f5 fw4 mb4 dib mr3">
329+
<<<<<<< HEAD
280330
<a href="https://brokebibliophiles.github.io/post/2022-02-25-bbb-meetup-45/" class="link black dim">
281331
BBB Meetup-45
332+
=======
333+
<a href="https://brokebibliophiles.github.io/post/2021-10-27-bbb-meetup-43/" class="link black dim">
334+
BBB Meetup-43
335+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
282336
</a>
283337
</h2>
284338

285339
<h2 class="f5 fw4 mb4 dib mr3">
340+
<<<<<<< HEAD
286341
<a href="https://brokebibliophiles.github.io/post/2021-10-27-bbb-meetup-43/" class="link black dim">
287342
BBB Meetup-43
343+
=======
344+
<a href="https://brokebibliophiles.github.io/post/2021-09-26-bbb-meetup-42/" class="link black dim">
345+
BBB Meetup-42
346+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
288347
</a>
289348
</h2>
290349

‎index.xml

+7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
<description>Recent content on Broke Bibliophiles Bangalore</description>
77
<generator>Hugo -- gohugo.io</generator>
88
<language>en-us</language>
9+
<<<<<<< HEAD
910
<lastBuildDate>Sun, 31 Jul 2022 15:07:30 +0530</lastBuildDate>
11+
=======
12+
<lastBuildDate>Sun, 26 Jun 2022 15:07:30 +0530</lastBuildDate>
13+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
1014

1115
<atom:link href="https://brokebibliophiles.github.io/index.xml" rel="self" type="application/rss+xml" />
1216

1317

1418
<item>
19+
<<<<<<< HEAD
1520
<title>BBB Meetup-50</title>
1621
<link>https://brokebibliophiles.github.io/post/2022-07-31-bbb-meetup-50/</link>
1722
<pubDate>Sun, 31 Jul 2022 15:07:30 +0530</pubDate>
@@ -22,6 +27,8 @@
2227
</item>
2328

2429
<item>
30+
=======
31+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
2532
<title>BBB Meetup-49</title>
2633
<link>https://brokebibliophiles.github.io/post/2022-06-26-bbb-meetup-49/</link>
2734
<pubDate>Sun, 26 Jun 2022 15:07:30 +0530</pubDate>

‎listicles/all-about-bangalore/index.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore | Books on Bangalore</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -33,14 +33,13 @@
3333
<meta property="article:modified_time" content="2021-10-09T13:47:08+05:30" />
3434
<meta itemprop="name" content="Books on Bangalore">
3535
<meta itemprop="description" content="Book Recommendations from all around about Bangalore and the places in it">
36-
<meta itemprop="datePublished" content="2021-10-09T13:47:08+05:30" />
37-
<meta itemprop="dateModified" content="2021-10-09T13:47:08+05:30" />
36+
<meta itemprop="datePublished" content="2021-10-09T13:47:08&#43;05:30" />
37+
<meta itemprop="dateModified" content="2021-10-09T13:47:08&#43;05:30" />
3838
<meta itemprop="wordCount" content="120">
3939

4040

4141

42-
<meta itemprop="keywords" content="" />
43-
<meta name="twitter:card" content="summary"/>
42+
<meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
4443
<meta name="twitter:title" content="Books on Bangalore"/>
4544
<meta name="twitter:description" content="Book Recommendations from all around about Bangalore and the places in it"/>
4645

‎listicles/all-about-bookclubs/index.html

+24
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66

77
<title>Broke Bibliophiles Bangalore | Bookclubs in Bangalore</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9+
<<<<<<< HEAD
910
<meta name="generator" content="Hugo 0.74.3" />
11+
=======
12+
<meta name="generator" content="Hugo 0.68.3" />
13+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
1014

1115

1216
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -33,6 +37,7 @@
3337
<meta property="article:modified_time" content="2022-04-06T13:47:08+05:30" />
3438
<meta itemprop="name" content="Bookclubs in Bangalore">
3539
<meta itemprop="description" content="All about the different bookclubs in Bangalore">
40+
<<<<<<< HEAD
3641
<meta itemprop="datePublished" content="2022-04-06T13:47:08+05:30" />
3742
<meta itemprop="dateModified" content="2022-04-06T13:47:08+05:30" />
3843
<meta itemprop="wordCount" content="201">
@@ -41,6 +46,15 @@
4146

4247
<meta itemprop="keywords" content="" />
4348
<meta name="twitter:card" content="summary"/>
49+
=======
50+
<meta itemprop="datePublished" content="2022-04-06T13:47:08&#43;05:30" />
51+
<meta itemprop="dateModified" content="2022-04-06T13:47:08&#43;05:30" />
52+
<meta itemprop="wordCount" content="225">
53+
54+
55+
56+
<meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
57+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
4458
<meta name="twitter:title" content="Bookclubs in Bangalore"/>
4559
<meta name="twitter:description" content="All about the different bookclubs in Bangalore"/>
4660

@@ -212,6 +226,16 @@ <h1 class="f1 athelas mt3 mb1">Bookclubs in Bangalore</h1>
212226
<li><strong>How to Reach</strong> : Join the Facebook group, Twitter (BYOBIndia), attend monthly meetups by RSVP</li>
213227
</ul>
214228
</li>
229+
<<<<<<< HEAD
230+
=======
231+
<li><a href="https://twitter.com/bookishOnSpaces">Bookish India</a>
232+
<ul>
233+
<li><strong>Status</strong> : Active</li>
234+
<li><strong>Medium</strong> : Online</li>
235+
<li><strong>How to Reach</strong> : Twitter (bookishOnSpaces), Weekly meetups by tuning into the Space on Sun nights</li>
236+
</ul>
237+
</li>
238+
>>>>>>> 3c777a0a490970f391e9d43455e81a91946e1c90
215239
<li>Atta Galatta Book Club
216240
<ul>
217241
<li><strong>Status</strong> : Currently Inactive</li>

‎listicles/all-about-clubhouse/index.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore | Clubhouse Silent Reads Discussions</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -33,14 +33,13 @@
3333
<meta property="article:modified_time" content="2021-01-31T20:47:08+05:30" />
3434
<meta itemprop="name" content="Clubhouse Silent Reads Discussions">
3535
<meta itemprop="description" content="These lists are around books that have been discussed from 7 PM - 9 PM on Saturdays following our Weekly Silent reading sessions on Clubhouse. The Silent Reading sessions happen at 7-7.40 PM everyday.">
36-
<meta itemprop="datePublished" content="2021-01-31T20:47:08+05:30" />
37-
<meta itemprop="dateModified" content="2021-01-31T20:47:08+05:30" />
36+
<meta itemprop="datePublished" content="2021-01-31T20:47:08&#43;05:30" />
37+
<meta itemprop="dateModified" content="2021-01-31T20:47:08&#43;05:30" />
3838
<meta itemprop="wordCount" content="55">
3939

4040

4141

42-
<meta itemprop="keywords" content="" />
43-
<meta name="twitter:card" content="summary"/>
42+
<meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
4443
<meta name="twitter:title" content="Clubhouse Silent Reads Discussions"/>
4544
<meta name="twitter:description" content="These lists are around books that have been discussed from 7 PM - 9 PM on Saturdays following our Weekly Silent reading sessions on Clubhouse. The Silent Reading sessions happen at 7-7.40 PM everyday."/>
4645

‎listicles/all-about-cricket/index.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<title>Broke Bibliophiles Bangalore | Books on Cricket</title>
88
<meta name="viewport" content="width=device-width,minimum-scale=1">
9-
<meta name="generator" content="Hugo 0.74.3" />
9+
<meta name="generator" content="Hugo 0.68.3" />
1010

1111

1212
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -33,14 +33,13 @@
3333
<meta property="article:modified_time" content="2021-01-31T20:47:08+05:30" />
3434
<meta itemprop="name" content="Books on Cricket">
3535
<meta itemprop="description" content="Book Recommendations from BBB Readers on Cricket - Indian and International Perspectives">
36-
<meta itemprop="datePublished" content="2021-01-31T20:47:08+05:30" />
37-
<meta itemprop="dateModified" content="2021-01-31T20:47:08+05:30" />
36+
<meta itemprop="datePublished" content="2021-01-31T20:47:08&#43;05:30" />
37+
<meta itemprop="dateModified" content="2021-01-31T20:47:08&#43;05:30" />
3838
<meta itemprop="wordCount" content="106">
3939

4040

4141

42-
<meta itemprop="keywords" content="" />
43-
<meta name="twitter:card" content="summary"/>
42+
<meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
4443
<meta name="twitter:title" content="Books on Cricket"/>
4544
<meta name="twitter:description" content="Book Recommendations from BBB Readers on Cricket - Indian and International Perspectives"/>
4645

0 commit comments

Comments
 (0)