Index: nodes/CNodeWBRotary2/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary2/wleiden.conf	(revision 3381)
+++ nodes/CNodeWBRotary2/wleiden.conf	(revision 4190)
@@ -86,15 +86,19 @@
 
 
+<<<<<<< .mine
+$config{'wi1'}=sprintf <<EW1;  # link naar Struyk Verwo
+=======
 $config{'wi1'}=sprintf <<EW1;  # link naar Stuykwo
+>>>>>>> .r3428
 TYPE=wireless
-IP=172.16.1.133/30
+IP=172.16.1.189/30
 DESC=Link naar struykwo
 SDESC=2struykwo
 SPEED=11534336
-POINT_TO_POINT=172.16.1.134
+POINT_TO_POINT=172.16.1.190
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.134
+OSPF_NEIGHBORS=172.16.1.190
 
 MODE=master