From 319f45b3eb1a398fe1a93a6b49ee2489d288f0ca Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Fri, 31 Mar 2023 11:55:16 -0700
Subject: [PATCH] Missed items (#291)

* Added avatars (#286)

* Deploy #287 (#288)

* Added avatars

* Added content from the 2023/03/22 update (#287)

* Added avatars (#286)

* Added localizations

* Added update, changed CSS

* Add logic for showing Lucifer uncap and 250 art

* Added new weapon series

* Added updates

* Add more items
---
 components/UpdatesPage/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/UpdatesPage/index.tsx b/components/UpdatesPage/index.tsx
index 7f1eec1f..84e902c6 100644
--- a/components/UpdatesPage/index.tsx
+++ b/components/UpdatesPage/index.tsx
@@ -90,11 +90,8 @@ const UpdatesPage = () => {
             '1040815300',
             '1040815400',
             '1040815000',
-<<<<<<< HEAD
             '1040024400',
             '1030609400',
-=======
->>>>>>> ca0d14b5 (Added items from 2023/03 Legfest and 2023/03/30 update (#290))
           ],
         }}
         numNotes={1}