From f7d1705e59f8175033f8222a889c7ca7e9df87cf Mon Sep 17 00:00:00 2001
From: Allie Bopp <aebopp@umich.edu>
Date: Thu, 18 Jun 2020 01:23:38 -0400
Subject: [PATCH] merge resolved

---
 .../__pycache__/__init__.cpython-36.pyc       | Bin 433 -> 400 bytes
 .../__pycache__/config.cpython-36.pyc         | Bin 616 -> 583 bytes
 .../__pycache__/model.cpython-36.pyc          | Bin 1595 -> 1562 bytes
 .../views/__pycache__/__init__.cpython-36.pyc | Bin 303 -> 270 bytes
 .../views/__pycache__/accounts.cpython-36.pyc | Bin 8142 -> 10395 bytes
 servicePoints/views/accounts.py               |   1 -
 sql/schema.sql                                |   5 +----
 ...b68456865edbbdaa67c99783de324711384437.jpg | Bin 7810 -> 0 bytes
 ...c8996fb92427ae41e4649b934ca495991b7852b855 |   0
 var/servicePoints.sqlite3                     | Bin 28672 -> 32768 bytes
 10 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg
 delete mode 100644 var/images/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855

diff --git a/servicePoints/__pycache__/__init__.cpython-36.pyc b/servicePoints/__pycache__/__init__.cpython-36.pyc
index b890e80cc2b9d8fb67beb2525dc9b78ddd312088..ae8c520b2453458e48760c1786f565c6eb628aac 100644
GIT binary patch
delta 62
zcmdnUJb{_rn3tDJk?;9Nc1=c2C;i;K68&WT(BjmhV*SMQtfYMX)YRl+6H8Nlpio(6
Qa%w<+W?o70<SIsU064%C-v9sr

delta 95
zcmbQhypfsRn3tDpb->Gw?3#>T$@;l@CHl$wp~b01#rnC4B_+lBF8Rr&xv6<TR&a7g
tetu4Peo?l5aA|ICYLStFk%7Let8=i4rD;G>epYI7iGBfuo*c<&4gm3?AX@+c

diff --git a/servicePoints/__pycache__/config.cpython-36.pyc b/servicePoints/__pycache__/config.cpython-36.pyc
index b66ba84188a594b21aaafed82eaf48f9bd9e303e..e2f47fdc2b33a9855315f2cf9e0a9c0260d21cf5 100644
GIT binary patch
delta 62
zcmaFCa-4<Tn3tDp|LT_;*{?BbI_T%-mFOqyhZd(673(LaXC>w9r=}(sn^>Ca1BJ>m
RlT!ooGxJJ{C#y3#0sym@74HB5

delta 95
zcmX@k@`8okn3tDpYQU?F?AI8*67_TQO7xTULyJ?3iuH37OG=9MUGkGlb5rwxtl;E~
t{QR8o{Gx3A;L_aO)FLATBLjU`SLa|8OVfa&{H)aE68!=QJ(-Qk5dcW?AsGMw

diff --git a/servicePoints/__pycache__/model.cpython-36.pyc b/servicePoints/__pycache__/model.cpython-36.pyc
index 86bb7b3a23476b2371ea8739ac81138b684f2091..987ba06aecd14df951ced9f5575b13c29be1c283 100644
GIT binary patch
delta 63
zcmdnZGmD4an3tF9!rx~b*)K6_+Uw`$mFOqyhZd(673(LaXC>w9r=}(sn^>Ca1BJ>m
SlT!ooGxJJ{H!CwqumAwc&K36n

delta 96
zcmbQmvzv$An3tDpb->Gw?3Wn567+NPO7xTULyJ?3iuH37OG=9MUGkGlb5rwxtl;E~
u{QR8o{Gx3A;L_aO)FLATBLjU`SLa|8OVfa&{H)aE68!=Qy_tzgf&~CnRUp;?

diff --git a/servicePoints/views/__pycache__/__init__.cpython-36.pyc b/servicePoints/views/__pycache__/__init__.cpython-36.pyc
index 180037e3f49e55ada44d0f5f95254730be1535b7..1d30055a28038c24f70515e1ec1990883944f38d 100644
GIT binary patch
delta 60
zcmZ3_)W^hb%*)GV&i8yG`*KYW{oK3~{bc>n;?$yI{lxUFq<sC<)Z}6lOH+NIP+4Yj
OYCwKwUP<x9ALaly@D$Ae

delta 93
zcmeBUTF=C8%*)HQI^g9*_T^rg`nh=}`pNpC#i>Qb`nicECB^zK`N^fZsd+$FaB@a|
reolCPQMP_?X>M+6k&%IsfxfG&bFhh}X+TkaR%&vIegTA@c-<TT>LMXC

diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
index 29b95f49454f3040969bbf9ac5eaff5f61fc6be4..87feb1c89c1e6ef633f85ad2d24f87b1e9244dab 100644
GIT binary patch
delta 3273
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

delta 1320
zcmYk+OKclO7y#h?_wDuj{mg?piIWEGG;I*=B}RQv6+sCmB(h3f<Jl&5ymmBp1gdO>
z;HW}EM6G@y4lNwGQp6z=y}+Ro2#Eu5L`EDcBm_Z-OO*>kVs^Vx*Vg<y`+xsG-WglI
zv-HE_#7VDLt3Nup%Fl7!Z=B;LvU!n>&hK!0Vse{r3Wit~fg>D&rc{=6p&{$a0Lm&6
zbgAL0Xl87<iAW?Oukl3rfF~+(?Q*QfW1BVr;wBy|=e2WQN4<~uE%VtHII?ZFSdfG)
z^xGIdLS_*XwJbnlB)-d)gLX~AQIjMot0rVy+F=<oVp-U>QHPC@@!f567ZDqua^NwN
zwHl+gO*m|lOj#DQE$6UlGGkfXw&M<)B~M$Hu<e-vTqJo?u#!nTIp=6NLFO$>*>=)l
zr^te3X#yo~=GpzLd{4MkFBq+Ep;lP#=(JNXs@-m<aIRh3GV~Ukm1^tlc5|goHwvXK
z!_evc-27bO{Q0w`Q>PbRq3woV>lQX2Ur~^A;K5n>7dVcJa)!SP=<(zPpnGU2p9FgX
z@ow<+=PuXq5#Im+cf2W=KgqEK5I_E@mS&Ic0(MqRay^*@ugiU<D>syeI^g<hPi=Te
z2-jRASn+AN=ejpC<m$J8<A&<>t!A@THT0pR8`XM~vLuJsv~Ogo`evJUaoT-NK4Jcr
zi@4`LCW<O(`(L?NgvdNg4t@1jt!->J^{#%QO%2TWKZob>d;g2lP-yBcOa-n$1>Xuh
zSe7<ax=Q4})Dnr(mwFuAoys0oATAaqqTLnya#tbVp1j9Sn{82L!$mv;7?`K;yAgU-
zZxNl2*I9gfe6zZy=kZ2x6JExHU>44yFEj=(U_Nvf%1A?5xPT9`@c>oWbADuQAj1MD
z?0+390NmUEJFEh0J&d$Q?wcC2)B_sGpz#`bAOJp~mvJZhBhq*gZ^cCT7C(&r3QM>Y
zTa+}`@DtvTe}Na1llXpO42Jkw;$zIF&d79;;X`~cc}ISY&1PhLIGMurWD4I%1;T%@
zR7Yij<IPVIfiB}asoV1FPfBkl#^XhH`wttAQWa<s*V8Y-3VxZM@*kRN{@HLmTVxgg
zN*{**ebS+^r6WKq`;Rg=!M)6Yn%^W_;@!~$;L#Xc2+d@uc`o!43q!u$p?>@{Hvw1h
zyW9d?#{Y7OsMT0Bi&o80F+&wkPfv~J*;IwcZx6d_g34z`BT6Qpc`g&ho$1K``HMh*

diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 8a3b12a..7737582 100644
--- a/servicePoints/views/accounts.py
+++ b/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()
diff --git a/sql/schema.sql b/sql/schema.sql
index 0e5ffc9..fab44f6 100644
--- a/sql/schema.sql
+++ b/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
diff --git a/var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg b/var/images/c0cf17efda2368530bb66b4e2fb68456865edbbdaa67c99783de324711384437.jpg
deleted file mode 100644
index b7f849e6e752e3a8331fe22bb1261a55ce6965e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7810
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
ak{mLsi3@Rso(-Jk|Bf&J{}I6Fx&H-B7inJr

diff --git a/var/images/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 b/var/images/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
deleted file mode 100644
index e69de29..0000000
diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3
index 6a0e7d9205f2272c6ae9612c83e0fd77dd25e5fe..c261955ae7d3382983d4e92ac248c9fc0e5b48ff 100644
GIT binary patch
delta 762
zcma)3&ubGw6rOEsldath#UFKBQwFKnNR^q{ncW$0u>@O;wS;IXC^)k-i=~O$Br2Y4
z>OWxJo8Y<EO8x}TUi<?@5K3>wOYz{rwWW~ar4Qb`$9#O><9%=AhqJLU@P2a41pwr;
zJdUBQ*<jKIH!tsa@HfbfRzcwl{8~6y_~_m8c1Nq9yWh?}>aOK-<He%$uGCSwVOw_n
zrEPcG$2C7!tCZ^%R4?DIR?zY9%!rH7i|6gmszD2j^~#+}4K3cUqs0f+>g+$PX`9-%
z(m#cX;f7TvYp39)JVI^TdbJv-Md;5Vl&m)FGu5={VYxOpU#`uBtaMUlskU&hTw6hR
zD=RZc<4Pl?Zs|;J-1nW$8|l1vE&Wxvntt%695>zZifIo{^me_efnf(S09kJgU59VG
z3r^n8V)HRve{EZxH~+uwr-~Cg9mpW0GGbb?kWmrngwW6uqqR{qAb6THVh9ho#zN>s
zCy@w5ln_h>C0bFd7{@ZANhn2_#6~G&_%aolb`W8#84sz5s3n1ntchbDVxg?EmZ?l8
zB$OJ8sj)bU!q8+DQywWI1;a*3V~xZk*?Ap!0N_Dy?8#5Kwd9_62YvTwCGQa22XOxo
zECK+XLErD+_Z0j+0QWNfcX;KZGnDz(Pe1BUA+inNc4q%4xU%fzfbU=Edi^?0)n2oK
t#xY}5iX<j6VNzv|vRFtNCR$QPBV`$}*(s!!0gDxrTuP!N!KoIU{{_`L)7St2

delta 1108
zcmZ8g&ud*p6u$S}mo|;>W{e``5kpdZr3fPP`^;=A1sA%A^&fC?&dizQY4d~EO2{fn
z{{U&p&VNE7dpCl+u3WiOOI!%ulnRO)=QXB+1GBmFo$q|-`_4T+9vuJNK3ZK_Y?|h3
zy_ctZ{GJ&vHt)avZ7=?8uJpH?<?qFl<u{kV?r-<Movpn7!)WQ`=EBwM<8k}&=IMw1
zt<w*dZ=8PBZ=8P9ubn;VVK5qwo;Tv7<wyN@qvy5a*U{0*$HT>y)$#hn&%`Eg@|`W5
z?oRi<oE~m%9^Rd8eS$lDe;b|B6OKuPEC~w+Yi&TFtaCs@pGwSX;tl9Pg^5zg0jyS%
zGen31f{)-3*vev}uJ77Y$yD&jpoN&IIF`n13r-aPD%xi4v`JECCPNTVN(Z*~a%8!_
zF#FmxJ14U*;A9Fu$dkL>;`sWF`7p?|x4(bq-n}XFEI%k)hufcj@&Azm9Yvc=EIwGU
z5ppCXwu!RLiP6C%nq;LWPaz{i{b+zF`{;`U?~Ru#YFG6obf~rFP#`!Appr*M2?lJ^
z-eF>?TnWJ5D5#YwLs1<0NC%ZuNI(%SDR!nP6|zm<IV!efdEy3(qMka_Y&JXiHw>ps
zbha9mE!)Z(imycyG!tl<%LKjjGU>p{C}N*8q~M}sWgr*^1!xL+b>zL*6{czoWW7NZ
zBN~~lvdo0aD6Q+f)r+E?^wsZNtR$--n*iD6JZ}u-AR0*723v<tE*Yr8+e_gG^;`;%
zCQFY+lMJ@zPgF|qR80Xus7)u{led1JNYT0W)()5?RQEM=Am<daabU16qMrktkH|q;
zTSG}T7PdJW6@mw8&{!oUYXEJFv1kky6{~tswl0~RM2V&7x~fqrBFxnexm16-p?KPe
zr{Z_<hxq$!W#dQj?v-w(-Q?j?H*PPMt6S(qI~xo;aqXb5B?EEZh`+>nh5saOy)o#<
z>leURYq!vLLL3~-`3K@zBc8qF{za_y-Fo{9^&eyVQp5${YCBwe>z$q1{j|Ny(@lJ^
jy|cHwQD)N(y}vVOY{iR4yr|%F@%Yn)(QDn>wM+Crf($LM

-- 
GitLab