Commit backend issue

wncc · Nov 24, 2024 · 9e59ae2 · 9e59ae2
1 parent 4fac735
commit 9e59ae2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/socbackend/accounts/migrations/0004_alter_userprofile_roll_number.py b/socbackend/accounts/migrations/0004_alter_userprofile_roll_number.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Generated by Django 4.2.6 on 2024-11-23 22:04
-=======
 # Generated by Django 4.2.6 on 2024-11-08 20:34
->>>>>>> 1748e05f5ce90e26d91fdb18e7e3dbff576f95cc
 
 import accounts.models
 from django.db import migrations, models