Merge branch 'master' of https://git.teknik.io/neetsgit/tiddlesv6

tiddles.org

@@ -180,20 +180,26 @@ interface LAN {
 *ANOTHER REBOOT*
 
 
+<<<<<<< HEAD
 sys-devices-virtual-net-6to4.device                                                      loaded active plugged   /sys/devices/virtual/net/6to4                                                 
 sys-devices-virtual-net-sit0.device                                                      loaded active plugged   /sys/devices/virtual/net/sit0                                                 
 sys-subsystem-net-devices-6to4.device                                                    loaded active plugged   /sys/subsystem/net/devices/6to4                                               
 sys-subsystem-net-devices-enp2s1.device                                                  loaded active plugged   82540EP Gigabit Ethernet Controller (Mobile) (Thinkpad)                       
 sys-subsystem-net-devices-sit0.device                                                    loaded active plugged   /sys/subsystem/net/devices/sit0    
 
+=======
+>>>>>>> c25b3760a71452e074acc992e7f6598abd88121f
 
 
 # ** COMMANDS ON THE CLIENT
 
+<<<<<<< HEAD
 I actually don't need to touch the client since I'm on V4 on it... All I care is for the server to have 6 and get coms with that.
 
 
 
+=======
+>>>>>>> c25b3760a71452e074acc992e7f6598abd88121f
 # ip tunnel add net6tun mode sit remote 192.168.0.204 local 192.168.0.166
 # ip link set net6tun up