remove merge conflicts
authorHannes Gredler <hannes@gredler.at>
Tue, 29 Apr 2008 06:50:00 +0000 (08:50 +0200)
committerHannes Gredler <hannes@gredler.at>
Tue, 29 Apr 2008 06:50:00 +0000 (08:50 +0200)
commit41611ea0edf47d734824e1b88e200b1a1988bd83
treec990f02e553b3dfc827ecc2672f629f10ebc7476
parent14a21b97c7ffb764291969036b9e27f4367b4b18
remove merge conflicts
lib/httpinfo/src/olsrd_httpinfo.c
lib/txtinfo/src/olsrd_txtinfo.c
src/tc_set.c