From 9e59ae24b8eb4ca94bab6ad266e0fdad14b699e6 Mon Sep 17 00:00:00 2001 From: Pratyaksh Bhardwaj Date: Sun, 24 Nov 2024 05:42:00 +0530 Subject: [PATCH] Commit backend issue --- .../accounts/migrations/0004_alter_userprofile_roll_number.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/socbackend/accounts/migrations/0004_alter_userprofile_roll_number.py b/socbackend/accounts/migrations/0004_alter_userprofile_roll_number.py index 35e0cfd..4981320 100644 --- 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