Merge branch 'penn-wrapped' of https://github.com/pennlabs/penn-mobile …

…into penn-wrapped
pennlabs · Nov 8, 2024 · 5ec9cf9 · 5ec9cf9
2 parents 2786e10 + eb43f14
commit 5ec9cf9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/backend/Pipfile b/backend/Pipfile
@@ -50,4 +50,4 @@ alt-profanity-check = "*"
 inflection = "*"
 
 [requires]
-python_version = "3.11"
+python_version = "3.11"
diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/penndata/admin.py b/backend/penndata/admin.py
@@ -7,7 +7,7 @@
     Event,
     FitnessRoom,
     FitnessSnapshot,
-    HomePageOrder
+    HomePageOrder,
 )
 
 
@@ -25,4 +25,3 @@ def image_tag(self, instance):
 admin.site.register(FitnessRoom, FitnessRoomAdmin)
 admin.site.register(FitnessSnapshot)
 admin.site.register(AnalyticsEvent)
-
diff --git a/backend/penndata/models.py b/backend/penndata/models.py
@@ -113,5 +113,3 @@ class CalendarEvent(models.Model):
 
     def __str__(self):
         return f"{self.date}-{self.event}"
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -113,5 +113,3 @@ class CalendarEvent(models.Model):

		def __str__(self):
		return f"{self.date}-{self.event}"