Bug 1269961 followup because I didn't resolve the merge conflict completely a=me FIREFOX_47_0b3_BUILD1 FIREFOX_47_0b3_RELEASE
authorWes Kocher <wkocher@mozilla.com>
Thu, 05 May 2016 12:51:46 -0700
changeset 365851 609000bcc11211d7c27ceea36fa2d2262fa0523f
parent 365850 aaa01584f1a60baabd1820670258f16ca61a8c68
child 365852 4b359b915f9ef011f3833278830f1cac19dae6c4
push id17839
push userbmo:jyavenard@mozilla.com
push dateWed, 11 May 2016 13:59:51 +0000
reviewersme
bugs1269961
milestone47.0
Bug 1269961 followup because I didn't resolve the merge conflict completely a=me
toolkit/components/telemetry/Histograms.json
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -10498,11 +10498,10 @@
   },
   "FX_CONTENT_CRASH_NOT_SUBMITTED": {
     "alert_emails": ["wmccloskey@mozilla.com"],
     "bug_numbers": [1269961],
     "expires_in_version": "never",
     "kind": "count",
     "releaseChannelCollection": "opt-out",
     "description": "Counts the number of times that about:tabcrashed was unloaded without submitting."
->>>>>>> graft
   }
 }