fix: merge conflicts

Author: suptower

bin/event_database

@@ -2,13 +2,8 @@
 04.10.2023 00:00:00::14.03.2024 00:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
 04.10.2023 00:00:00::14.03.2024 00:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
 04.10.2023 08:15:00::14.03.2024 12:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
-<<<<<<< Updated upstream
-04.10.2023 00:00:00::14.03.2024 00:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
-04.10.2023 08:15:00::04.10.2023 12:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
-=======
 04.10.2023 08:15:00::14.03.2024 12:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
 04.10.2023 08:15:00::14.03.2024 12:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
 04.10.2023 08:15:00::14.03.2024 12:00:00::Semesterende::Semesterzeitraum des Wintersemesters 2023/24.
 04.10.2024 09:00:10::10.10.2024 12:00:00:ST::SD
 16.10.2027 14:00:00::17.10.2028 00:00:00::Semesterende::SD
->>>>>>> Stashed changes

bin/event_database.csv

@@ -25,11 +25,8 @@
   (let ((tomorrow (clingon:getopt cmd :show-tomorrow))
 	(showAll (clingon:getopt cmd :show-all))
 	(date (clingon:getopt cmd :show-date)))
-<<<<<<< Updated upstream
-=======
-    (cleanupDatabase)
-    (sortDatabase)
->>>>>>> Stashed changes
+	(cleanupDatabase)
+	(sortDatabase)
     (cond (tomorrow
 	   (format t "Showing events for ~a~%" (formatDateOnly (formatLocalTime (local-time:timestamp+ (local-time:today) 1 :day))))
 	   (showEvents (formatLocalTime (local-time:timestamp+ (local-time:today) 1 :day))))
@@ -48,8 +45,6 @@
    :description "Show upcoming events from the database for today"
    :options (show/options)
    :handler #'show/handler))
-<<<<<<< Updated upstream
-=======
 
 (defun showEvents (date)
   (let ((eventList (list)))
@@ -88,4 +83,3 @@
 		       (format t "~a: ~a~%" (getTimes (first details) (second details)) (third details))
 		       (format t "~a - ~a: ~a~%" (first details) (second details) (third details))))))
       (format t "No upcoming events found.~%")))
->>>>>>> Stashed changes

src/show.lisp

@@ -1,7 +1,5 @@
 (in-package :ical-cli)
 
-
-
 (defun mergeSortOld (buffer)
   "Perform a mergeSort on the given buffer and return the sorted buffer"
   (let ((left (list))

src/sort.lisp

@@ -100,18 +100,6 @@
 		 (setf retList (append retList (list (subseq line (+ (nth i positions) 2) (nth (+ i 1) positions)))))))
     retList))
 
-
-<<<<<<< Updated upstream
-(defun displayEvents (eventList)
-  (if eventList
-      (progn
-	(loop for event in eventList
-	      do
-		 (let ((details (decodeLine event)))
-		   (format t "~a: ~a~%" (getTimes (first details) (second details)) (third details)))))
-      (format t "No upcoming events found.~%")))
-		 
-=======
 (defun encodeLine (list)
   "Inverse function to decodeLine"
   (let ((output nil))
@@ -161,4 +149,3 @@
 	  do
 	     (addEvent (encodeline event)))))
 
->>>>>>> Stashed changes