From 0d05e3011953c44a3ee8287d358d5bf838881ce8 Mon Sep 17 00:00:00 2001
From: Brandon Wong <brandonwong14@berkeley.edu>
Date: Mon, 13 Nov 2023 15:34:51 -0800
Subject: [PATCH] Fixed Calendar Clear Filters Issue

---
 hknweb/templates/events/index.html | 2 +-
 pyproject.toml                     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/hknweb/templates/events/index.html b/hknweb/templates/events/index.html
index 80e86a26..08251e0e 100644
--- a/hknweb/templates/events/index.html
+++ b/hknweb/templates/events/index.html
@@ -127,7 +127,7 @@
 
         const urlParams = new URLSearchParams(window.location.search);
         urlParams.delete("rsvpd");
-        urlParams.delete("unrsvpd");
+        urlParams.delete("not_rsvpd");
         urlParams.delete("event_types");
 
         if (history.pushState) {
diff --git a/pyproject.toml b/pyproject.toml
index 3249d56c..ffb34b44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,11 +15,7 @@ fabric = "^3.2.2"
 django-autocomplete-light = "^3.9.7"
 djangorestframework = "^3.14.0"
 google-api-python-client = "^2.99.0"
-<<<<<<< HEAD
-pillow = "^9.5.0"
-=======
 icalendar = "^5.0.10"
->>>>>>> aeb8ef26d262cbd2094143129e97b43fb58f6bfd
 
 [tool.poetry.group.prod]
 optional = true