fix broken merge
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 12 Jan 2011 21:05:09 +0000 (22:05 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 12 Jan 2011 21:05:09 +0000 (22:05 +0100)
commit3a02c22cf7e9572c3ec03b464d2b91fac8416e1e
tree0746712f5f04883cb197b0cbb6941ddae3a23c49
parent999254a3a6641ea112b48c1eca65599fb9989185
fix broken merge
src/target/firmware/apps/simtest/main.c