Bug 1059186: fix mismerge in Histograms.json rs=jesup
authorRandell Jesup <rjesup@jesup.org>
Sun, 28 Sep 2014 12:25:19 -0400
changeset 225403 bc811bbf346d223b442fa88d0e98abad4506c692
parent 225402 1244193877db101ec2de6c3ea65897a8d1d5b191
child 225404 693efca0fbe7caf33b2898884662d7fa2d01eefa
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1059186
milestone34.0a2
Bug 1059186: fix mismerge in Histograms.json rs=jesup
toolkit/components/telemetry/Histograms.json
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6518,15 +6518,15 @@
     "n_values": 4,
     "description": "Tracking protection shield (0 = not shown, 1 = blocked, 2 = loaded, 3 = due to mixed content"
   },
   "TRACKING_PROTECTION_EVENTS": {
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 3,
     "description": "Doorhanger shown = 0, Disable = 1, Enable = 2"
-  }
+  },
   "LOOP_CLIENT_CALL_URL_REQUESTS_SUCCESS": {
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "Stores 1 if generating a call URL succeeded, and 0 if it failed."
-  },
+  }
 }