merge resolved

servicePoints/views/accounts.py

@@ -156,7 +156,6 @@ def createOrg():
 
 @servicePoints.app.route('/', methods=['GET', 'POST'])
 def index():
-    """Render index page."""
     if 'username' in flask.session:
         username = flask.session["username"]
         cursor = servicePoints.model.get_db()

sql/schema.sql

@@ -16,14 +16,12 @@ CREATE TABLE orgs(
 	  PRIMARY KEY(orgName)
 );
 
-<<<<<<< HEAD
-
 CREATE TABLE tutors(
 	  username VARCHAR(20) NOT NULL,
 	  subject VARCHAR(40) NOT NULL,
 	  time VARCHAR(80) NOT NULL,
 	  PRIMARY KEY(username)
-=======
+);
 CREATE TABLE requests(
 	  postid INTEGER NOT NULL,
 	  member VARCHAR(20) NOT NULL,
@@ -31,5 +29,4 @@ CREATE TABLE requests(
 	  service VARCHAR(40) NOT NULL,
 	  filename VARCHAR(64) NOT NULL,
 	  PRIMARY KEY(postid)
->>>>>>> a13a88a5b357d5ce4091c99247484845da5be53e
 );
\ No newline at end of file