From 592ceb5b29590bdb234c770571ef81d6ffb955d6 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Sun, 1 Feb 2026 19:08:27 +0100 Subject: [PATCH] Fix rebase errors --- {tools => server}/CAN/CAN_interface.cpp | 0 {tools => server}/CAN/CAN_interface.hpp | 0 {tools => server}/CMakeLists.txt | 0 {tools => server}/main.cpp | 0 {tools => server}/message_parser.cpp | 0 {tools => server}/simulator_base.cpp | 0 {tools => server}/simulator_base.hpp | 0 {tools => server}/simulators.cpp | 0 {tools => server}/simulators.hpp | 0 {tools => server}/simulators/can_debugger.cpp | 0 {tools => server}/simulators/can_debugger.hpp | 0 {tools => server}/simulators/test_sim.cpp | 0 {tools => server}/simulators/test_sim.hpp | 0 {tools => server}/websocket.cpp | 0 {tools => server}/websocket.hpp | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename {tools => server}/CAN/CAN_interface.cpp (100%) rename {tools => server}/CAN/CAN_interface.hpp (100%) rename {tools => server}/CMakeLists.txt (100%) rename {tools => server}/main.cpp (100%) rename {tools => server}/message_parser.cpp (100%) rename {tools => server}/simulator_base.cpp (100%) rename {tools => server}/simulator_base.hpp (100%) rename {tools => server}/simulators.cpp (100%) rename {tools => server}/simulators.hpp (100%) rename {tools => server}/simulators/can_debugger.cpp (100%) rename {tools => server}/simulators/can_debugger.hpp (100%) rename {tools => server}/simulators/test_sim.cpp (100%) rename {tools => server}/simulators/test_sim.hpp (100%) rename {tools => server}/websocket.cpp (100%) rename {tools => server}/websocket.hpp (100%) diff --git a/tools/CAN/CAN_interface.cpp b/server/CAN/CAN_interface.cpp similarity index 100% rename from tools/CAN/CAN_interface.cpp rename to server/CAN/CAN_interface.cpp diff --git a/tools/CAN/CAN_interface.hpp b/server/CAN/CAN_interface.hpp similarity index 100% rename from tools/CAN/CAN_interface.hpp rename to server/CAN/CAN_interface.hpp diff --git a/tools/CMakeLists.txt b/server/CMakeLists.txt similarity index 100% rename from tools/CMakeLists.txt rename to server/CMakeLists.txt diff --git a/tools/main.cpp b/server/main.cpp similarity index 100% rename from tools/main.cpp rename to server/main.cpp diff --git a/tools/message_parser.cpp b/server/message_parser.cpp similarity index 100% rename from tools/message_parser.cpp rename to server/message_parser.cpp diff --git a/tools/simulator_base.cpp b/server/simulator_base.cpp similarity index 100% rename from tools/simulator_base.cpp rename to server/simulator_base.cpp diff --git a/tools/simulator_base.hpp b/server/simulator_base.hpp similarity index 100% rename from tools/simulator_base.hpp rename to server/simulator_base.hpp diff --git a/tools/simulators.cpp b/server/simulators.cpp similarity index 100% rename from tools/simulators.cpp rename to server/simulators.cpp diff --git a/tools/simulators.hpp b/server/simulators.hpp similarity index 100% rename from tools/simulators.hpp rename to server/simulators.hpp diff --git a/tools/simulators/can_debugger.cpp b/server/simulators/can_debugger.cpp similarity index 100% rename from tools/simulators/can_debugger.cpp rename to server/simulators/can_debugger.cpp diff --git a/tools/simulators/can_debugger.hpp b/server/simulators/can_debugger.hpp similarity index 100% rename from tools/simulators/can_debugger.hpp rename to server/simulators/can_debugger.hpp diff --git a/tools/simulators/test_sim.cpp b/server/simulators/test_sim.cpp similarity index 100% rename from tools/simulators/test_sim.cpp rename to server/simulators/test_sim.cpp diff --git a/tools/simulators/test_sim.hpp b/server/simulators/test_sim.hpp similarity index 100% rename from tools/simulators/test_sim.hpp rename to server/simulators/test_sim.hpp diff --git a/tools/websocket.cpp b/server/websocket.cpp similarity index 100% rename from tools/websocket.cpp rename to server/websocket.cpp diff --git a/tools/websocket.hpp b/server/websocket.hpp similarity index 100% rename from tools/websocket.hpp rename to server/websocket.hpp