From b306929311f04dced4e5c0d9c55509df0553bfb1 Mon Sep 17 00:00:00 2001
From: TrickyLeifa <date.epoch@gmail.com>
Date: Fri, 17 May 2024 19:44:37 +0200
Subject: Resolved merge conflicts.

This comment format is just tiring for the eyes. Imagine being on 1080p and not being able to read more than 5 method definitions due to comments.
---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3684f1c..d482a5c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,8 @@ add_executable(Attorney_Online
   src/path_functions.cpp
   src/scrolltext.cpp
   src/scrolltext.h
+  src/serverdata.cpp
+  src/serverdata.h
   src/text_file_functions.cpp
   src/widgets/aooptionsdialog.cpp
   src/widgets/aooptionsdialog.h
-- 
cgit