X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc48c73f3cc8c2359831fe53c8eec90e958e605a..03cc5f8ec503448fb9cff1e27c8527a5341b42a3:/build/script/rebuild-makefiles.sh?ds=sidebyside

diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh
index 286fb0c4f6..5031074b1d 100644
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -166,17 +166,6 @@ rm ${WORKDIR}/*.con
 }
 
 
-<<<<<<< rebuild-makefiles.sh
-add_win_docs ()
-{
-### starts with wx-docs-xxx.zip
-for f in `find ${WORKDIR}/archives/win/ -name wx\* ` ; do       
-       mv $f ${WORKDIR}/archives/`basename $f | tr -d ".ZIP"`-${CURDATE}.zip
-       done
-       
-}
-
-=======
 add_win_files ()
 {
 ### starts with wx-docs-xxx.zip
@@ -191,20 +180,14 @@ for f in `find ${WORKDIR}/archives/win/ -name wx\*.EXE ` ; do
 
 }
 
->>>>>>> 1.4
 update_from_cvs
 regenerate_makefiles
 package_makefiles
 package_cvs All wxWidgets
 package_cvs Gtk wxGTK
 
-<<<<<<< rebuild-makefiles.sh
-do_docs
-add_win_docs
-=======
 do_docs
 add_win_files
->>>>>>> 1.4
 
 copy_files