From 1484db366e8cc45f1a16fbe9e0566674fe488034 Mon Sep 17 00:00:00 2001 From: Manisha Keim Date: Wed, 16 Oct 2019 21:45:53 +0530 Subject: [PATCH 01/19] update manisha.html manisha's PR --- index.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index a4a62c3..6b71059 100644 --- a/index.html +++ b/index.html @@ -126,6 +126,20 @@

2019

+
+
+
Manisha
+
IGDTUW
+
+
+ + /manisha +
+
+
+
+ +
Manthan Keim
@@ -134,11 +148,11 @@

2019

- - +
From 29c11f301f46886dba8483def9c32aeabdc264db Mon Sep 17 00:00:00 2001 From: komalthesomething <56617229+komalthesomething@users.noreply.github.com> Date: Thu, 17 Oct 2019 20:07:23 +0530 Subject: [PATCH 02/19] update--name.html trying --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index a4a62c3..4e08eef 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,21 @@

2019

- + + +
+
+
--komalthesomething--
+
--heyaa still trying--
+
+ +
+
+
+
From b4b696be88da38518b0e1df625011d29973b5446 Mon Sep 17 00:00:00 2001 From: komalthesomething <56617229+komalthesomething@users.noreply.github.com> Date: Thu, 17 Oct 2019 20:26:05 +0530 Subject: [PATCH 03/19] updatemaybe.html still trying --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index a4a62c3..3bd8727 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,21 @@

2019

- + + +
+
+
komalthesomething
+
maybesomeday
+
+ +
+
+
+
From ddd880c5cd75a20500c7caa57766c4467409ac94 Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:07:22 +0530 Subject: [PATCH 04/19] Varun.html This is my PR --- index.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index a4a62c3..d9edb6a 100644 --- a/index.html +++ b/index.html @@ -111,6 +111,17 @@

2019

+ +
+
+
Varun Dev
+
This is it
+
+
+ + /VarunDev7777 + +
@@ -137,8 +148,7 @@

2019

-
- +

From 8990b5e4b28f0b9a666170c534254525e22610ef Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:09:13 +0530 Subject: [PATCH 05/19] Update index.html --- index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index d9edb6a..582b955 100644 --- a/index.html +++ b/index.html @@ -110,8 +110,9 @@

2019

- - + + +
Varun Dev
@@ -121,7 +122,7 @@

2019

/VarunDev7777 - +
From d15fca3b9743ae00859aa42e5633ffc947aae13c Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:11:12 +0530 Subject: [PATCH 06/19] Update index.html --- index.html | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index 582b955..c87e113 100644 --- a/index.html +++ b/index.html @@ -111,18 +111,6 @@

2019

- - -
-
-
Varun Dev
-
This is it
-
-
- - /VarunDev7777 - -
@@ -137,6 +125,17 @@

2019

+ +
+
+
Varun Dev
+
This is it
+
+
+ + /VarunDev7777 + +
From a8075ee2cb0eafe203560030df69f9424726936d Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:13:00 +0530 Subject: [PATCH 07/19] Update index.html --- index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index c87e113..e34083d 100644 --- a/index.html +++ b/index.html @@ -134,7 +134,10 @@

2019

+
+
+
From 677c0a77fc1caf3dc22e6831e76a640efee82dbd Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:15:34 +0530 Subject: [PATCH 08/19] Update index.html --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index e34083d..f599fd7 100644 --- a/index.html +++ b/index.html @@ -151,7 +151,21 @@

2019

-
+
+ +
+
+
--Raja Rai--
+
HackClubMait
+
+
+ + tonikroos8 +
+
+
+
+

From c01f5709803973853d496f92dc6eab49ff4afc3b Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:17:43 +0530 Subject: [PATCH 09/19] Update index.html --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f599fd7..1ac5e54 100644 --- a/index.html +++ b/index.html @@ -165,7 +165,21 @@

2019

- + + +
+
+
shubham
+
maiden
+
+
+ + +
+
+
+
+

From 08f3147fad98c590b50be6cc47b128bc6f38bc88 Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:19:03 +0530 Subject: [PATCH 10/19] Update index.html --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 1ac5e54..5a6c096 100644 --- a/index.html +++ b/index.html @@ -179,7 +179,21 @@

2019

- + + +
+
From 81c19100a720c6577913bc31e4bc28357d8e555e Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:20:18 +0530 Subject: [PATCH 11/19] Update index.html --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 5a6c096..ce26d64 100644 --- a/index.html +++ b/index.html @@ -193,7 +193,21 @@

2019

- + + +
+
+
komalthesomething
+
maybesomeday
+
+ +
+
+
+
From d1f29ca3572f93eef33cbc0e3178365ccf1e668d Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:21:47 +0530 Subject: [PATCH 12/19] Update index.html --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index ce26d64..121dc22 100644 --- a/index.html +++ b/index.html @@ -208,6 +208,20 @@

2019

+ +
+
+
Rajat Jain
+
HI
+
+
+ + /rajatjain97 +
+
+
+
+
From 257d4d507721e83d97b656cbeb7ea417a0c4b53f Mon Sep 17 00:00:00 2001 From: nitishnegi62 <55306038+nitishnegi62@users.noreply.github.com> Date: Fri, 18 Oct 2019 10:33:46 +0530 Subject: [PATCH 13/19] my_nitsh.html 18_oct --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index 121dc22..e528be7 100644 --- a/index.html +++ b/index.html @@ -221,6 +221,20 @@

2019

+ + +
+
+
Nitish Negi
+
from kinnaur
+
+ +
+
+

From f54241283528e3842c497c743744603a03fce6c7 Mon Sep 17 00:00:00 2001 From: christomyth <56711424+christomyth@users.noreply.github.com> Date: Fri, 18 Oct 2019 10:38:46 +0530 Subject: [PATCH 14/19] Update index.html --- index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 121dc22..642515d 100644 --- a/index.html +++ b/index.html @@ -221,7 +221,21 @@

2019

- + + +
+
+
Mant New
+
Merge Conflict check
+
+
+ + /invalid +
+
+
+
+
From 13eb5257d1b213aba11cb93c602f6242557283ba Mon Sep 17 00:00:00 2001 From: Manthan Keim Date: Fri, 18 Oct 2019 10:46:45 +0530 Subject: [PATCH 15/19] Update index.html --- index.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 7665f47..8798713 100644 --- a/index.html +++ b/index.html @@ -221,7 +221,6 @@

2019

-mant_new
@@ -232,7 +231,10 @@

2019

/invalid - +
+
+ +
@@ -243,16 +245,11 @@

2019

/nitishnegi62 - master
- mant_new - - - - master +
From 82c1362100415b5dad05b5fcf541f277b5c59d23 Mon Sep 17 00:00:00 2001 From: Snehil Date: Fri, 18 Oct 2019 11:04:58 +0530 Subject: [PATCH 16/19] Added my name to index.html --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index 8798713..58f5020 100644 --- a/index.html +++ b/index.html @@ -249,6 +249,20 @@

2019

+ + +
+
+
Snehil
+
Declare Variables, Not Wars.
+
+ +
+
+

From ee0cb04ecc4cec084b945d23d532d9333e11388c Mon Sep 17 00:00:00 2001 From: sagar-robot Date: Fri, 18 Oct 2019 19:52:18 +0530 Subject: [PATCH 17/19] My Commit --- index.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 2866912..cb34d36 100644 --- a/index.html +++ b/index.html @@ -162,12 +162,11 @@

2019

- - + +
@@ -311,6 +310,20 @@

2019

+ +
+
+
Sagar
+
Bonsoir Elliot
+
+
+ + /sagar +
+
+
+
+
From 6d60b6a224751c527c8934d6fe0cecbefc9532e4 Mon Sep 17 00:00:00 2001 From: sagar-robot Date: Fri, 18 Oct 2019 20:02:39 +0530 Subject: [PATCH 18/19] Second Commit --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index cb34d36..58ee9b9 100644 --- a/index.html +++ b/index.html @@ -250,6 +250,20 @@

2019

+ + +
+
+
--Raja Rai--
+
HackClubMait
+
+
+ + tonikroos8 +
+
+
+
From 59c235f0d2735a2914c4e7b5fd1788e51d321669 Mon Sep 17 00:00:00 2001 From: Sagar196 <55680976+Sagar196@users.noreply.github.com> Date: Fri, 18 Oct 2019 20:12:10 +0530 Subject: [PATCH 19/19] merge conflict check 18/10/2019 --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index cb34d36..e4470b0 100644 --- a/index.html +++ b/index.html @@ -251,6 +251,20 @@

2019

+ +
+
+
check merge conflict
+
Merge Conflict check
+
+
+ + /invalid +
+
+
+
+