gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

removed conflict resolution info that would probably cause syntax errors

Browse Source
This commit is contained in:
imdano
2007-07-16 06:41:34 +00:00
parent c047b9ed45
commit 2f942ff865
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
networking.py
View File

@@ -383,7 +383,6 @@ class Wireless:
misc.Run("ifconfig " + self.wireless_interface + " broadcast " + network["broadcast"])
<<<<<<< .mine
if not network.get("dns1") == None:
self.lock.acquire()
self.ConnectingMessage = 'setting_static_dns'
@@ -398,7 +397,6 @@ class Wireless:
if not network.get("dns3") == None:
print "setting the third dns server..."
misc.WriteLine(resolv,"nameserver " + network["dns3"])
=======
if network.get('static_dns') == True and network.get('global_dns') == False:
if not network.get("dns1") == None:
self.lock.acquire()
@@ -427,7 +425,6 @@ class Wireless:
if not self.global_dns_3 == None:
print "setting the third dns server..."
misc.WriteLine(resolv,"nameserver " + self.global_dns_3)
>>>>>>> .r63
if not network.get('ip') == None:
self.lock.acquire()