Commit 9b9fccccb14018d3f342e8d116ebaec028649792

  • avatar
  • arvind
  • Mon Jan 23 12:21:32 IST 2012
Removing conflicts
  
77from bson import Code
88import urllib2
99import StringIO
10import gdata.gauth
11import gdata.blogger.client
1210from flask import g
1311from flask import redirect
14<<<<<<< HEAD
1512import urllib
16=======
1713from urllib import quote_plus
1814from urllib import unquote_plus
19>>>>>>> upstream/gh-pages
2015app = Flask(__name__)
2116connection = pymongo.Connection('localhost',27017) #Create the object once and use it.
2217db = connection['dev_alipi']