fixed broken files.bkl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 10f507b34395c4f9c4cc63d1695e44dcb85714b7..4fb85d1110090101417cb14401550959071afe6e 100644 (file)
--- 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">