Artifact b10a4b0d07d8bdbe2ba90b2dbf1cfea2a3b5787a:

Ticket change [b10a4b0d07] - Add attachment "merge-marker.diff" to ticket [e3a1beef67] by anonymous 2010-10-14 15:50:19.

---

0000: 41 20 6d 65 72 67 65 2d 6d 61 72 6b 65 72 2e 64  A merge-marker.d
0010: 69 66 66 20 65 33 61 31 62 65 65 66 36 37 63 39  iff e3a1beef67c9
0020: 37 65 62 32 65 34 64 35 61 31 34 30 63 62 30 62  7eb2e4d5a140cb0b
0030: 66 31 61 32 32 32 65 63 30 35 31 32 20 35 65 63  f1a222ec0512 5ec
0040: 61 34 63 66 62 37 63 64 32 66 30 31 64 32 61 35  a4cfb7cd2f01d2a5
0050: 64 38 65 66 31 32 33 64 61 38 32 39 62 32 63 65  d8ef123da829b2ce
0060: 66 33 64 39 64 0a 43 20 4f 62 76 69 6f 75 73 5c  f3d9d.C Obvious\
0070: 73 66 69 78 5c 73 66 6f 72 5c 73 74 68 65 5c 73  sfix\sfor\sthe\s
0080: 69 73 73 75 65 2e 0a 44 20 32 30 31 30 2d 31 30  issue..D 2010-10
0090: 2d 31 34 54 31 35 3a 35 30 3a 31 39 0a 55 20 61  -14T15:50:19.U a
00a0: 6e 6f 6e 79 6d 6f 75 73 0a 5a 20 39 66 65 64 30  nonymous.Z 9fed0
00b0: 35 64 65 33 30 30 35 33 36 63 37 61 39 65 33 38  5de300536c7a9e38
00c0: 62 37 62 63 39 65 66 33 33 64 39 0a              b7bc9ef33d9.