try clobbering to fix win problem after updater binary moved on Windows
authorBrian R. Bondy <netzen@gmail.com>
Wed, 21 Jan 2015 23:12:18 -0500
changeset 491369 54805643390a8074ae8f4127051db718c7433ac2
parent 491368 9f969ed65bf6033fcaa91462d41cecbd38853077
child 491370 4baf21fa0db8966e2a8bbee7499497203778cf78
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone37.0a1
try clobbering to fix win problem after updater binary moved on Windows
CLOBBER
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,13 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-<<<<<<< local
-Bug 973933 - MAR updater cert data
-=======
-Bug 1066383 - Clobber needed due to build system not reliably picking up an IDL removal.
->>>>>>> other
+Bug 973933 - MAR updater cert data updated