diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-25 15:38:03 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-25 15:38:03 -0600 |
commit | 001fe1738656aecd1c57790fb29fb36c48147d50 (patch) | |
tree | a5b78ffb88922e7849a27e4d634c0501be329e15 /ci/trusty | |
parent | ccae91d723835c188cbef160b1057706dd870ea8 (diff) |
merge erro
Change-Id: I386b218e768b9c7836d862b1bb2f1b4670bb240f
Diffstat (limited to 'ci/trusty')
0 files changed, 0 insertions, 0 deletions