henry/whisper-com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHG: merged commits

Browse Source
This commit is contained in:
Henry Winkel
2022-12-21 14:16:39 +01:00
parent 08acefd140
commit 635ff4e74e
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -61,11 +61,6 @@ add_library(whisper-com STATIC
src/WHISPER/Messages/Leave.cpp 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/join.pb.cc
include/WHISPER/Messages/Protos/leave.pb.cc include/WHISPER/Messages/Protos/leave.pb.cc
<<<<<<< HEAD
=======
# include/WHISPER/Messages/Protos/raw_track.pb.cc
>>>>>>> 1ae59dbf28dcff8e15f88de743522c6021f0e26f
) )