Index: /nodes/CNodeLMstruykverwo1/wleiden.conf
===================================================================
--- /nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 2894)
+++ /nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 2895)
@@ -1,3 +1,2 @@
-<<<<<<< .mine
 #
 #
@@ -14,5 +13,5 @@
 $labelpos='left';
 
-$status='down';
+$status='planned';
 
 #$Real_X=103500;
@@ -145,149 +144,2 @@
 
 EW2
-=======
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
-# config CNodeLMstruykverwo1
-$location="Westerdijk Leimuiden";
-$master_ip='172.25.52.1';  
-$gw_open='closed';
-$nodetype='CNode';
-$nodename='LMstruykverwo1';
-$OS='FreeBSD';
-$labelpos='left';
-
-$status='planned';
-
-#$Real_X=103500;
-#$Real_Y=464800;
-                                                                                                                         
-#$X='103546';
-#$Y='465132';
-
-$X='103546';
-$Y='464232';
-                                                                                         
-$AGGREGATE=22;
-
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0
-TYPE=ethernet
-IP=172.25.52.65??/29
-
-DESC=Ethernet poort Stuykverwo1
-SDESC=eth0
-SPEED=10240000000
-
-DHCP=68-70
-#DHCP=no
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-ED0
-
-$config{'sis1'}=sprintf <<ED0;  # ethernet poort naar Struykverwo2
-TYPE=ethernet
-IP=172.16.1.121??/30
-
-DESC=Ethernet naar Struykverwo2
-SDESC=2struykvw2
-SPEED=10240000000
-
-#DHCP=68-70
-DHCP=no
-
-POINT_TO_POINT=172.16.1.122?
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.122?
-
-ED0
-
-$config{'wi0'}=sprintf <<EW0;  # link naar Node Hoogmade kerk (slave)
-TYPE=wireless
-IP=172.16.1.126??/30
-DESC=Link naar NodeHMkerk
-SDESC=2hoogmade
-SPEED=11534336
-POINT_TO_POINT=172.16.1.125??
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.125??
-
-MODE=managed
-ESSID=il-nw.hmkerk1.wleiden.net
-CHANNEL=11??
-
-POLAR=Vert
-ANTENNA=PA4040
-GAIN=15dBi
-DIRECTION=280
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=17
-DHCP=no
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;  # OMNI
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=AP voor de buurt
-SDESC=ap
-SPEED=11534336
-
-DHCP=10-60
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-MODE=master
-ESSID=ap.LMstruykverwo.wleiden.net
-CHANNEL=8
-
-POLAR=Vert
-ANTENNA=omni
-GAIN=8dBi
-DIRECTION=40??
-BEAMWIDTH=360
-CABLE=0
-HEIGTH=17
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Leimuiden Kerk (master)
-TYPE=wireless
-IP=172.16.1.129/30??
-DESC=Link naar LMkerk
-SDESC=2lmkerk
-SPEED=11534336
-POINT_TO_POINT=172.16.1.130??
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.130??
-
-MODE=master
-ESSID=il-w.LMstruykvw.wleiden.net
-CHANNEL=5
-
-POLAR=Hor
-ANTENNA=SD15
-GAIN=15dBi
-DIRECTION=210
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=17
-
-
-DHCP=no
-
-EW2
->>>>>>> .r2884