Merge remote-tracking branch 'origin/develop' into develop

2018-12-03 14:39:29 +01:00
parent d194b9431b 0f15f2e367
commit 1b746e0b0f
73 changed files with 1298 additions and 379 deletions
@@ -2,7 +2,11 @@
 <serverConfig>
  <ncConfig>
    <ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
+<<<<<<< HEAD
    <showNcHMI>true</showNcHMI>
+=======
+    <showNcHMI>false</showNcHMI>
+>>>>>>> develop
    <ncIpAddress>localhost</ncIpAddress>
    <ncPort>8080</ncPort>
    <machineModel>Ares 37 OF</machineModel>