weird merge conflict fixed

SasView · Jun 30, 2023 · 3865aef · 3865aef
1 parent b143fb0
commit 3865aef
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/webfit/data/models.py b/webfit/data/models.py
@@ -57,11 +57,8 @@ class Data(models.Model):
     ]
 
     public_file_ids = [
-<<<<<<< HEAD
 
-=======
 
->>>>>>> 78158ec23b861429bec242bbe70ab845bc32fa22
     ]
 
     analysis = models.ForeignKey("AnalysisBase.id", on_delete=models.CASCADE)