test merge

18 years ago · 5446b2509f
parent 4a564775bd 792481c669
commit 5446b2509f
3 changed files with 3 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+*.pyc
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 Dependencies
 ============
- 
+
 xulrunner
 gecko-embed

--- a/sugar/browser/BrowserActivity.py
+++ b/sugar/browser/BrowserActivity.py
@ -9,8 +9,7 @@ from sugar.shell import activity
 from sugar.browser import NotificationBar
 from sugar.browser import NavigationToolbar
 from sugar.presence.PresenceService import PresenceService
-import random
-
+from sugar.p2p.model.LocalModel import LocalModel

 _BROWSER_ACTIVITY_TYPE = "_web_olpc._udp"
 _SERVICE_URI_TAG = "URI"