39
40
<Lollipop Position="0.2" />
41
42
<Class Name="Canonical.Bazaar.Conflict">
44
45
<FileName>Conflict.cs</FileName>
45
46
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
49
50
<Position X="5" Y="0.5" Width="1.75" />
52
53
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
56
57
<Position X="5" Y="1.5" Width="1.75" />
65
59
<FileName>Change.cs</FileName>
66
60
<HashCode>CAQAAEAAAAAJAgJYwAECACQAAAYtAAAAAgggAEBAJAA=</HashCode>