merge fix

chaos_monkey/config.py

@@ -143,12 +143,8 @@ class Configuration(object):
     # sets whether or not to retry failed hosts on next scan
     retry_failed_explotation = True
 
-<<<<<<< HEAD
-    internet_services = ["monkey.guardicore.com", "www.google.com"]
-=======
     # addresses of internet servers to ping and check if the monkey has internet acccess.
-    internet_services = ["www.guardicore.com", "www.google.com"]
->>>>>>> origin/master
+    internet_services = ["monkey.guardicore.com", "www.google.com"]
 
     ###########################
     # scanners config

chaos_monkey/example.conf

@@ -65,6 +65,7 @@
     "singleton_mutex_name": "{2384ec59-0df8-4ab9-918c-843740924a28}",
     "skip_exploit_if_file_exist": true,
     "ssh_user": "root",
+    "local_network_scan": true,
     "tcp_scan_get_banner": true,
     "tcp_scan_interval": 200,
     "tcp_scan_timeout": 10000,