changes

API/app.py

@@ -3,12 +3,8 @@ from flask import Flask, render_template, request, jsonify, make_response
 from API.model.color.colorModel import save_color_session_details, sendPredictData
 from API.model.readModel import save_activity_details, save_session_details
 from API.model.userModel import getUser, saveUserSession, logoutUser
-<<<<<<< HEAD
 from API.model.color.colorModel import *
-=======
-from API.model.color.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, \
-    storeResult, save_color_session_details
->>>>>>> cdf409073e925ffb983057db2cfacef7030302a9
+from API.model.color.colorModel import *
 from flask import Flask, redirect, url_for, render_template, request, jsonify, make_response
 import random
 import os