test merge

This commit is contained in:
Dan Williams 2006-06-16 13:30:54 -04:00
commit 5446b2509f
3 changed files with 3 additions and 3 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.pyc

2
README
View File

@ -1,6 +1,6 @@
Dependencies
============
xulrunner
gecko-embed

View File

@ -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"