From 635ff4e74e933672b79401bc684cfdef2e0dc194 Mon Sep 17 00:00:00 2001 From: Henry Winkel Date: Wed, 21 Dec 2022 14:16:39 +0100 Subject: [PATCH] CHG: merged commits --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0585d14..ca503f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,11 +61,6 @@ add_library(whisper-com STATIC src/WHISPER/Messages/Leave.cpp -<<<<<<< HEAD -======= - # include/WHISPER/Messages/Track.hpp - # src/WHISPER/Messages/Track.cpp ->>>>>>> 1ae59dbf28dcff8e15f88de743522c6021f0e26f @@ -75,10 +70,6 @@ add_library(whisper-com STATIC include/WHISPER/Messages/Protos/join.pb.cc include/WHISPER/Messages/Protos/leave.pb.cc -<<<<<<< HEAD -======= - # include/WHISPER/Messages/Protos/raw_track.pb.cc ->>>>>>> 1ae59dbf28dcff8e15f88de743522c6021f0e26f )