From fee0970200914c34b7e9e342a8bfd288ddf90949 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 21 Aug 2003 13:58:50 +0000
Subject: [PATCH] fixed broken files.bkl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/files.bkl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 10f507b343..4fb85d1110 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -113,10 +113,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/utils.cpp
-<<<<<<< files.bkl
-    <!-- src/mac/utilsexc.cpp -->
-=======
->>>>>>> 1.74
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
-- 
2.45.2