comparison etc/MACHINES @ 98651:28e7a63d1369

Delete leftover conflict markers.
author Romain Francoise <romain@orebokech.com>
date Sun, 12 Oct 2008 09:17:13 +0000
parents c3512b2085a0
children 09f1342109b9
comparison
equal deleted inserted replaced
98650:7581dc5f5f96 98651:28e7a63d1369