Skip to content

Commit

Permalink
address merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@Naeemkh
Naeemkh committed May 16, 2024
2 parents e1f2ca4 + 199306e commit 64a49f2
Show file tree
Hide file tree
Showing 107 changed files with 6,382 additions and 3,740 deletions.
202 changes: 115 additions & 87 deletions .all-contributorsrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@
"profile": "https://github.com/shanzehbatool",
"contributions": []
},
{
"login": "mpstewart1",
"name": "Matthew Stewart",
"avatar_url": "https://avatars.githubusercontent.com/mpstewart1",
"profile": "https://github.com/mpstewart1",
"contributions": []
},
{
"login": "JaredP94",
"name": "Jared Ping",
"avatar_url": "https://avatars.githubusercontent.com/JaredP94",
"profile": "https://github.com/JaredP94",
"contributions": []
},
{
"login": "ishapira1",
"name": "ishapira",
"avatar_url": "https://avatars.githubusercontent.com/ishapira1",
"profile": "https://github.com/ishapira1",
"contributions": []
},
{
"login": "eliasab16",
"name": "eliasab16",
Expand All @@ -63,17 +63,17 @@
"contributions": []
},
{
"login": "NaN",
"name": "Maximilian Lam",
"avatar_url": "https://www.gravatar.com/avatar/7c34633d1ec9625618e54ca802a6eeca?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"login": "ishapira1",
"name": "ishapira",
"avatar_url": "https://avatars.githubusercontent.com/ishapira1",
"profile": "https://github.com/ishapira1",
"contributions": []
},
{
"login": "mpstewart1",
"name": "Matthew Stewart",
"avatar_url": "https://avatars.githubusercontent.com/mpstewart1",
"profile": "https://github.com/mpstewart1",
"login": "NaN",
"name": "Maximilian Lam",
"avatar_url": "https://www.gravatar.com/avatar/fa9de66acd58daa5b4580f804c8e3554?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
{
Expand All @@ -90,34 +90,48 @@
"profile": "https://github.com/jaysonzlin",
"contributions": []
},
{
"login": "18jeffreyma",
"name": "Jeffrey Ma",
"avatar_url": "https://avatars.githubusercontent.com/18jeffreyma",
"profile": "https://github.com/18jeffreyma",
"contributions": []
},
{
"login": "sophiacho1",
"name": "Sophia Cho",
"avatar_url": "https://avatars.githubusercontent.com/sophiacho1",
"profile": "https://github.com/sophiacho1",
"contributions": []
},
{
"login": "18jeffreyma",
"name": "Jeffrey Ma",
"avatar_url": "https://avatars.githubusercontent.com/18jeffreyma",
"profile": "https://github.com/18jeffreyma",
"contributions": []
},
{
"login": "korneelf1",
"name": "Korneel Van den Berghe",
"avatar_url": "https://avatars.githubusercontent.com/korneelf1",
"profile": "https://github.com/korneelf1",
"contributions": []
},
{
"login": "zishenwan",
"name": "Zishen",
"avatar_url": "https://avatars.githubusercontent.com/zishenwan",
"profile": "https://github.com/zishenwan",
"contributions": []
},
{
"login": "alxrod",
"name": "Alex Rodriguez",
"avatar_url": "https://avatars.githubusercontent.com/alxrod",
"profile": "https://github.com/alxrod",
"contributions": []
},
{
"login": "srivatsankrishnan",
"name": "Srivatsan Krishnan",
"avatar_url": "https://avatars.githubusercontent.com/srivatsankrishnan",
"profile": "https://github.com/srivatsankrishnan",
"contributions": []
},
{
"login": "andreamurillomtz",
"name": "Andrea Murillo",
Expand All @@ -126,10 +140,10 @@
"contributions": []
},
{
"login": "srivatsankrishnan",
"name": "Srivatsan Krishnan",
"avatar_url": "https://avatars.githubusercontent.com/srivatsankrishnan",
"profile": "https://github.com/srivatsankrishnan",
"login": "ma3mool",
"name": "Abdulrahman Mahmoud",
"avatar_url": "https://avatars.githubusercontent.com/ma3mool",
"profile": "https://github.com/ma3mool",
"contributions": []
},
{
Expand All @@ -149,17 +163,10 @@
{
"login": "NaN",
"name": "Aghyad Deeb",
"avatar_url": "https://www.gravatar.com/avatar/f36cbf06b5d628db59b1474bebfea781?d=identicon&s=100",
"avatar_url": "https://www.gravatar.com/avatar/14fc01e7ce71f4cfebeceff24b191fc6?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
{
"login": "zishenwan",
"name": "Zishen",
"avatar_url": "https://avatars.githubusercontent.com/zishenwan",
"profile": "https://github.com/zishenwan",
"contributions": []
},
{
"login": "DivyaAmirtharaj",
"name": "Divya",
Expand All @@ -168,17 +175,10 @@
"contributions": []
},
{
"login": "jared-ni",
"name": "Jared Ni",
"avatar_url": "https://avatars.githubusercontent.com/jared-ni",
"profile": "https://github.com/jared-ni",
"contributions": []
},
{
"login": "ELSuitorHarvard",
"name": "ELSuitorHarvard",
"avatar_url": "https://avatars.githubusercontent.com/ELSuitorHarvard",
"profile": "https://github.com/ELSuitorHarvard",
"login": "MichaelSchnebly",
"name": "Michael Schnebly",
"avatar_url": "https://avatars.githubusercontent.com/MichaelSchnebly",
"profile": "https://github.com/MichaelSchnebly",
"contributions": []
},
{
Expand All @@ -188,6 +188,13 @@
"profile": "https://github.com/Ekhao",
"contributions": []
},
{
"login": "jared-ni",
"name": "Jared Ni",
"avatar_url": "https://avatars.githubusercontent.com/jared-ni",
"profile": "https://github.com/jared-ni",
"contributions": []
},
{
"login": "oishib",
"name": "oishib",
Expand All @@ -196,10 +203,10 @@
"contributions": []
},
{
"login": "MichaelSchnebly",
"name": "Michael Schnebly",
"avatar_url": "https://avatars.githubusercontent.com/MichaelSchnebly",
"profile": "https://github.com/MichaelSchnebly",
"login": "ELSuitorHarvard",
"name": "ELSuitorHarvard",
"avatar_url": "https://avatars.githubusercontent.com/ELSuitorHarvard",
"profile": "https://github.com/ELSuitorHarvard",
"contributions": []
},
{
Expand All @@ -210,10 +217,10 @@
"contributions": []
},
{
"login": "jaywonchung",
"name": "Jae-Won Chung",
"avatar_url": "https://avatars.githubusercontent.com/jaywonchung",
"profile": "https://github.com/jaywonchung",
"login": "leo47007",
"name": "YU SHUN, HSIAO",
"avatar_url": "https://avatars.githubusercontent.com/leo47007",
"profile": "https://github.com/leo47007",
"contributions": []
},
{
Expand All @@ -224,24 +231,17 @@
"contributions": []
},
{
"login": "jzhou1318",
"name": "Jennifer Zhou",
"avatar_url": "https://avatars.githubusercontent.com/jzhou1318",
"profile": "https://github.com/jzhou1318",
"contributions": []
},
{
"login": "marcozennaro",
"name": "Marco Zennaro",
"avatar_url": "https://avatars.githubusercontent.com/marcozennaro",
"profile": "https://github.com/marcozennaro",
"login": "jaywonchung",
"name": "Jae-Won Chung",
"avatar_url": "https://avatars.githubusercontent.com/jaywonchung",
"profile": "https://github.com/jaywonchung",
"contributions": []
},
{
"login": "pongtr",
"name": "Pong Trairatvorakul",
"avatar_url": "https://avatars.githubusercontent.com/pongtr",
"profile": "https://github.com/pongtr",
"login": "colbybanbury",
"name": "Colby Banbury",
"avatar_url": "https://avatars.githubusercontent.com/colbybanbury",
"profile": "https://github.com/colbybanbury",
"contributions": []
},
{
Expand All @@ -251,6 +251,13 @@
"profile": "https://github.com/eurashin",
"contributions": []
},
{
"login": "AditiR-42",
"name": "Aditi Raju",
"avatar_url": "https://avatars.githubusercontent.com/AditiR-42",
"profile": "https://github.com/AditiR-42",
"contributions": []
},
{
"login": "ShvetankPrakash",
"name": "Shvetank Prakash",
Expand All @@ -259,24 +266,38 @@
"contributions": []
},
{
"login": "colbybanbury",
"name": "Colby Banbury",
"avatar_url": "https://avatars.githubusercontent.com/colbybanbury",
"profile": "https://github.com/colbybanbury",
"login": "arbass22",
"name": "Andrew Bass",
"avatar_url": "https://avatars.githubusercontent.com/arbass22",
"profile": "https://github.com/arbass22",
"contributions": []
},
{
"login": "AditiR-42",
"name": "Aditi Raju",
"avatar_url": "https://avatars.githubusercontent.com/AditiR-42",
"profile": "https://github.com/AditiR-42",
"login": "marcozennaro",
"name": "Marco Zennaro",
"avatar_url": "https://avatars.githubusercontent.com/marcozennaro",
"profile": "https://github.com/marcozennaro",
"contributions": []
},
{
"login": "arbass22",
"name": "Andrew Bass",
"avatar_url": "https://avatars.githubusercontent.com/arbass22",
"profile": "https://github.com/arbass22",
"login": "jzhou1318",
"name": "Jennifer Zhou",
"avatar_url": "https://avatars.githubusercontent.com/jzhou1318",
"profile": "https://github.com/jzhou1318",
"contributions": []
},
{
"login": "pongtr",
"name": "Pong Trairatvorakul",
"avatar_url": "https://avatars.githubusercontent.com/pongtr",
"profile": "https://github.com/pongtr",
"contributions": []
},
{
"login": "BrunoScaglione",
"name": "Bruno Scaglione",
"avatar_url": "https://avatars.githubusercontent.com/BrunoScaglione",
"profile": "https://github.com/BrunoScaglione",
"contributions": []
},
{
Expand All @@ -300,6 +321,13 @@
"profile": "https://github.com/gnodipac886",
"contributions": []
},
{
"login": "abigailswallow",
"name": "abigailswallow",
"avatar_url": "https://avatars.githubusercontent.com/abigailswallow",
"profile": "https://github.com/abigailswallow",
"contributions": []
},
{
"login": "jessicaquaye",
"name": "Jessica Quaye",
Expand All @@ -324,7 +352,7 @@
{
"login": "NaN",
"name": "Annie Laurie Cook",
"avatar_url": "https://www.gravatar.com/avatar/f1ebb6908872dcd6a2f10790eb14e44d?d=identicon&s=100",
"avatar_url": "https://www.gravatar.com/avatar/38b1f271710b4e194fb990f3af181f89?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
Expand All @@ -350,23 +378,23 @@
"contributions": []
},
{
"login": "abigailswallow",
"name": "abigailswallow",
"avatar_url": "https://avatars.githubusercontent.com/abigailswallow",
"profile": "https://github.com/abigailswallow",
"login": "NaN",
"name": "Yu-Shun Hsiao",
"avatar_url": "https://www.gravatar.com/avatar/ef3a35266c587a9b2c1bbf4e3be600b2?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
{
"login": "NaN",
"name": "Costin-Andrei Oncescu",
"avatar_url": "https://www.gravatar.com/avatar/44fb0390f4701d5b8888b9d48e1f16a8?d=identicon&s=100",
"avatar_url": "https://www.gravatar.com/avatar/1b784ecc7b8ac6875182287b7036fa7a?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
{
"login": "NaN",
"name": "Batur Arslan",
"avatar_url": "https://www.gravatar.com/avatar/669bb20b25d4988d6ba52f11ea7cac91?d=identicon&s=100",
"avatar_url": "https://www.gravatar.com/avatar/a0acef9d1ad19d971be2d7f11e4b74ed?d=identicon&s=100",
"profile": "https://github.com/harvard-edge/cs249r_book/graphs/contributors",
"contributions": []
},
Expand Down
Loading

0 comments on commit 64a49f2

Please sign in to comment.