From 536054b3f0e2db85c61a7033f898fa481105cf4b Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Thu, 6 Aug 2020 10:23:12 -0400
Subject: [PATCH] Merge assets/CMakeLists.txt

---
 assets/CMakeLists.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 6628e1549..2e0666172 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -17,17 +17,11 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
 ####################
 
 set(SRB2_ASSET_HASHED
-<<<<<<< HEAD
 "main.kart;\
 gfx.pk3;\
 textures.pk3;\
 chars.pk3;\
 maps.pk3;\
-=======
-"srb2.pk3;\
-player.dta;\
-zones.pk3;\
->>>>>>> srb2/next
 patch.pk3"
 	CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!"
 )