Fixes conflicts after merge

Samo Penic

2016-12-06 1d1f5861495fc6e07d8a683ca8dbbaa43936b212

 python/networkedExample.py

@@ -22,6 +22,6 @@
Runs=[run2, run3]

hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo'},
   {'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
   {'name':'altea','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})

tsmgr.start(hosts)