dot_draw plugin: remove merge conflict
authorClemens Hopfer <datacop@wireloss.net>
Thu, 8 May 2008 15:24:19 +0000 (17:24 +0200)
committerClemens Hopfer <datacop@wireloss.net>
Thu, 8 May 2008 15:24:19 +0000 (17:24 +0200)
commitc65a04ddd2477f0149fc62302569f39c9dea3892
treebbfad6db91944ee1e6d533163cd42d29d0590491
parent9463c18d603efeaddf96cbc59bea3e7a1d6684af
dot_draw plugin: remove merge conflict
lib/dot_draw/src/olsrd_dot_draw.c