mozilla/zamboni — comment on commit a6071970a73397cfac87e786eea1f9fb182a90af
File: media/js/lib/jstestnet.js line 41
By kumar303:

Be careful of resolving conflicts. Looks like you clobbered the newer code. I fixed it https://github.com/mozilla/zamboni/commit/de36fbe