solve some merge problems

2007-07-30 15:03:45 +01:00
parent 0f5b5f1f6c
commit f597f96152
3 changed files with 5 additions and 5 deletions
--- a/examples/wscript
+++ b/examples/wscript
@@ -13,5 +13,5 @@ def build(bld):
    obj = create_ns_prog('csma-cd-one-subnet', 'csma-cd-one-subnet.cc', deps=['csma-cd', 'internet-node'])

    obj = create_ns_prog('simple-p2p-olsr', 'simple-p2p-olsr.cc',
-                         deps=['p2p', 'internet-node', 'olsr'])
+                         deps=['point-to-point', 'internet-node', 'olsr'])