Indentation on publiclab#5 fix

rohaid-bakh · Apr 6, 2022 · 3e7b917 · 3e7b917
1 parent 19f05ac
commit 3e7b917
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/app/views/spam2/_nodes.html.erb b/app/views/spam2/_nodes.html.erb
@@ -2,11 +2,7 @@
 $(document).ready(function () {
 	var table = table_main("#node_table");
 	$("#all").click(function () { //select all button
-<<<<<<< HEAD
-		select_all();
-=======
-            select_all();
->>>>>>> 1c07eb68 (Removed Duplicate Code #10897 Fix)
+              select_all();
   });
   var pageselect = localStorage.getItem('page-select') || '30';
   $("#pageselect").val(pageselect);