fix merge conflict
authorSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:08:46 +0000 (12:08 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:09:26 +0000 (12:09 -0400)
commit8615288ad1f321195dbc3e063bfb6f295fa28cd2
tree8fceb75f40c968e3d69169b3684272f726a2ff2a
parentf8c3b55edf6f8a54556d36982897a974f723f5ef
fix merge conflict
moonshot-ui.spec.in