fix

CITATION.cff

@@ -25,8 +25,8 @@ keywords:
   - spiderweb
 license: GPL-3.0
 <<<<<<< HEAD
-version: v2.4.2
-date-released: 2023-02-12
+version: v2.4.5
+date-released: 2023-11-11
 =======
 version: v2.4.5
 date-released: 2023-11-11

docs/CHANGELOG.md

@@ -1,7 +1,4 @@
 ### Change log
-<<<<<<< HEAD
-Date: 12/02/2023 
-=======
 Date: 11/11/2023 
 Release: v2.4.5
 - added "back to top" button

static/js/dev/table.js

@@ -354,10 +354,8 @@ function refresh_timer() {
 	params['lr']=tb.getLastRowId();
 	
 	//Open a new connection, using the GET request on the URL endpoint
-<<<<<<< HEAD
 	qryString=qryString.concat('&'.concat(Math.random()));   //used to prevent caching
 	fetch(qryString)
-=======
 	//let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content");	
 	fetch('spotlist', {
 		method: 'POST',
@@ -368,7 +366,6 @@ function refresh_timer() {
 		},
 		body: JSON.stringify( params )  
 	})
->>>>>>> staging
 		.then((response) => response.json())
 		.then((data_new) => {
 			try {