Fixing merge conflicts

1 files changed, 27 insertions, 0 deletions

diff --git a/bot/resources/events/advent_of_code/about.json b/bot/resources/events/advent_of_code/about.json
new file mode 100644
index 00000000..dd0fe59a
--- /dev/null
+++ b/bot/resources/events/advent_of_code/about.json
@@ -0,0 +1,27 @@
+[
+    {
+        "name": "What is Advent of Code?",
+        "value": "Advent of Code (AoC) is a series of small programming puzzles for a variety of skill levels, run every year during the month of December.\n\nThey are self-contained and are just as appropriate for an expert who wants to stay sharp as they are for a beginner who is just learning to code. Each puzzle calls upon different skills and has two parts that build on a theme.",
+        "inline": false
+    },
+    {
+        "name": "How do I sign up?",
+        "value": "Sign up with one of these services:",
+        "inline": true
+    },
+    {
+        "name": "Auth Services",
+        "value": "GitHub\nGoogle\nTwitter\nReddit",
+        "inline": true
+    },
+    {
+        "name": "How does scoring work?",
+        "value": "For the [global leaderboard](https://adventofcode.com/leaderboard), the first person to get a star first gets 100 points, the second person gets 99 points, and so on down to 1 point at 100th place.\n\nFor private leaderboards, the first person to get a star gets N points, where N is the number of people on the leaderboard. The second person to get the star gets N-1 points and so on and so forth.",
+        "inline": false
+    },
+    {
+        "name": "Join our private leaderboard!",
+        "value": "Come join the Python Discord private leaderboard and compete against other people in the community! Get the join code using `.aoc join` and visit the [private leaderboard page](https://adventofcode.com/leaderboard/private) to join our leaderboard.",
+        "inline": false
+    }
+]