Commit 5291ae05 authored by Gaia Pushbot's avatar Gaia Pushbot
Browse files

Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 

Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/5cffbcaff577
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #13066 from Pike/bug-930469-malformed-properties

bug 930469, malformed properties file.

========

https://hg.mozilla.org/integration/gaia-central/rev/89f65b6d853c
Author: Axel Hecht <axel@pike.org>
Desc: bug 930469, malformed properties file.
Remove leftover merge conflict marker
parent 811b36eb

b2g/config/gaia.json

+1 −1
Original line number Diff line number Diff line 
{

    "revision": "84806d46b65c7e226b6a9e78232b6aa69a0a8354", 

    "revision": "5cffbcaff577ce74c28a82e1ac45e76e44eb841e", 

    "repo_path": "/integration/gaia-central"

}