<servicedata>

<service name="tar_scm">

    <param name="url">https://github.com/openSUSE/aaa_base.git</param>

<<<<<<< Updated upstream

    <param name="changesrevision">4f16b1614fac8432188271c8363b1e6217944b4c</param>

=======

    <param name="changesrevision">d7a7d3adc3b583e0951b985aa4f72ec3f6e58415</param>

>>>>>>> Stashed changes

</service>

</servicedata>