From b79555c386e9cc61c79939014c6f10c3271ef585 Mon Sep 17 00:00:00 2001
From: SovereigntyIsNotFreedom <SovereigntyIsNotFreedom@nowhere.moe>
Date: Sun, 13 Apr 2025 19:13:22 +0100
Subject: [PATCH] Removed added submission to .gitignore

---
 scripts/lantern.py         | 8 --------
 submissions/submission.csv | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/scripts/lantern.py b/scripts/lantern.py
index dd37a4c..db03c56 100644
--- a/scripts/lantern.py
+++ b/scripts/lantern.py
@@ -1199,11 +1199,6 @@ Maintenance:
                 break
             
             case 11:
-<<<<<<< HEAD
-=======
-                category = "ExternalUser"
-                sensitive = "YES"
->>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa
                 try:       
                     print_colors("1) Move entries to verified 2) Move entries from submission to unverified  3) Delete from submission file 0) exit")
                     option = int(input("Enter an option: "))
@@ -1220,11 +1215,8 @@ Maintenance:
                             link = submission_df.iloc[indx]['link'].strip()
                             name = submission_df.iloc[indx]['name'].strip()
                             desc = submission_df.iloc[indx]['desc'].strip()
-<<<<<<< HEAD
                             category = submission_df.iloc[indx]['category'].strip()
                             sensitive = "YES" if submission_df.iloc[indx]['sensitive'].strip() == 'y' else "NO"
-=======
->>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa
 
                                 
                             new_row = pd.DataFrame({'Instance': [instance], 'Category': [category], 'Name':[name],'URL':[link],'Sensitive':[sensitive],'Description':[desc],'Status':['YES'],'Score':['100']})
diff --git a/submissions/submission.csv b/submissions/submission.csv
index dde578d..c89d2dd 100644
--- a/submissions/submission.csv
+++ b/submissions/submission.csv
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
 link,name,desc,category,sensitive
-,,
 http://git.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,"Nihilist Git repo","GIt repo","Git Repo",n
-=======
-link,name,desc
-f45bzecjvj6aviwkczxpr3vukapibx275hlqetrl6fo6youlsbbz2myd.onion,MyInstance,"Lantern Instance"
->>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa