CLOBBER
author Dão Gottwald <dao@mozilla.com>
Sat, 26 May 2018 18:37:27 +0200
changeset 473482 d81b581fbd2cdb5fcfd982c7d2d3222204192725
parent 473181 4632e7d90224f898dcfb675c47cacfa9784be5f5
child 473771 c296fde26f5f8263485bd9b5eaba0c4e58f56989
permissions -rw-r--r--
Bug 1451827 - In dark popups styled by webext themes, set --urlbar-popup-url-color and .text-link color to the same value. r=jaws a=RyanVM MozReview-Commit-ID: 20dLQ4bIBgu

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
#
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
#
# Note: The description below will be part of the error message shown to users.
#
# 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.

<<<<<<< working copy
Merge day clobber=======
Bug 1451159 - Moved testing/profiles/prefs_general.js (prevents symlinked file does not exist)
>>>>>>> merge rev