From ef6d04b0e87a72517412afa02961dea652006223 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 14 Dec 2021 23:08:47 +0200
Subject: [PATCH] fsddsf

---
 files/routes/awards.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/routes/awards.py b/files/routes/awards.py
index e8095ccbe0..5dc02abb7e 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -307,7 +307,6 @@ def shop(v):
 @validate_formkey
 def buy(v, award):
 	AWARDS = {
-<<<<<<< HEAD
 		"snow": {
 			"kind": "snow",
 			"title": "Snow",