From 1ef8d51e1429b909f52b3f7b54456a84ff25cbfc Mon Sep 17 00:00:00 2001 From: moblim Date: Wed, 28 Jul 2021 10:30:12 -0400 Subject: [PATCH] Adding to gitignore These files always create conflicts but are temp files that change with every instance of visual studio. Adding these to gitignore so that we can avoid superfluous conflicts --- .gitignore | 3 +++ .vs/Effort-Task-3/v16/.suo | Bin 80384 -> 79360 bytes .vs/VSWorkspaceState.json | 2 +- .vs/slnx.sqlite | Bin 90112 -> 90112 bytes 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c2ebf49..9df9658 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ yarn-debug.log* yarn-error.log* psiturkit/*_turk +.vs/VSWorkspaceState.json +.vs/slnx.sqlite +.vs/Effort-Task-3/v16/.suo diff --git a/.vs/Effort-Task-3/v16/.suo b/.vs/Effort-Task-3/v16/.suo index 325f3d98c79acf5320ab912c67473018ad8b96f2..de1ddc10e360b26c8770d4e245500fdf826bc37d 100644 GIT binary patch delta 3469 zcmd5;eNa?Y6o2=zyDYj3h=Q;Pg21}!uD$(6{9wh!?^H&b%1;(pL_tt@ZBRiL9nC2w z;~iJZF%>jt%F5)GIi>jwQ7lLCpK?l?X{xcAn$iiU92Gj3-M21|HPd9-o%!v#@7%BR zJLlYU*ViNS{Um#tgBvALiLnfm$S_O?A1tneB3m0T1B&DffG!)8X z$#8JXcdD{*LOo&&f@dqEZ>;@Ou7e4$99BOpY)49+Qjw_3u%Ctqr%vfn>XhD41hu3H zC8bXLlsc6Xb=r?Y-GkKW8Q84-zd`Ouo?$3;>JvI3QRjl+MwA%{=#-Tb-9YB!Q7sm>DBG(0^SL9K=>noOZb?S0H9K+h19pdIlg;io&n8Nq>f`h1$`&=Zh~O0;*I z3^vY~4QE*ndS-Btsa?WrwZshRY!WzzTIAJ8_6S_j&VjSqldW+wKF6t|9BD>NT)~@D zsFbcvfP9XMw5GDW&8ebSNH<{e+%6SOA}Pjn0eJ0=&Ag1{2sxw9k+x?p64@d=7`hf0 z3Yq$Agf}^5G>O2qdnjDfB+2vf<0@=0eX1t(PNpI5TVrnI$JP)JY#2KqX6p1pk52WM zKG+fRfxHSg8Y|p3M6zv@8cBNo+nU_T{@>#Irt6Mvvaa1cq`SzwzB{?|q-CX|C9z@+ z(^N1N#L12@i=XA%EG!GGDev!DoKSwO^cB*U*GZI-VQf?__;Cb58+_BDfwWyk^6{%Y zL<9A^8q_=Rj?!Bag(ac_)c%nW`+*|SY+jyUR#v^vyCl@ZCDm21$ghp9tL5}u?Q~bA z$6bLdv%u%qMr>x{G3LWT^gH-@)8r(D9vAdBc;{VKlU&r$ni}%6uT%y#^XI4u)zA_l zjqs&1C576m(9e?$4T97gJL0@#eX!++{1h zo_^PO`q?GAZhp2@JYM@w?-a~nF4otZ^4#8VW!ElFUH8ZxD8f{K671idu5j6kIfEN^ zw#1JMgu~!;d0k7))=+e$UVn6IH*vJ_%~y5rw#yEKu4dn4%ZcRtjVqqK`uT)(YsJ30 zTOXHSdA~YiJM|@X-)z?d01^Mw10lGyr$&6vI()EP}Sy~!BR)u8vR zaQbuUMNEO?cDo+^?)X1Og>s7={_pu?{X_ggi#mUER&$q}jQke$icTW1@1O+kkL>8V*OX7 zF{n*|14q*!hEIWG4g1J|xkC3#V9*$t?D<>qqaeeS$4?dK%(8`&^{kAM!2q)bL%XQB5DKEGnALQu88M-*=nXAYNhP&`YZ#b*s2?l|Xz hg3~(q`P`3eD#Pzjl^%L8<7TR$p(9tA()r2iKLC5uqLTms delta 2489 zcmcJRe{54#6vy9v>)Q%@-S5${pWP^9lnvW$j16%t+e8_#wJ-?|5X)AWWBf4IIdE}B z2#K&n_Aamp24giOihD{7mp*@!Be0J z%mw6;(a#1BO`k>L94Ie|2V#`<^9M;qgPHK?>r--c*`&#OawuV)uu;M&5jmQl zlCxE_<)NqKl!9D<4GWYUJ!S=DN=`mVkK0>gzLK~SliLh(GUWL{PmBw4C8z;nV|L(5~s^qqauV3x+*agI!Rz7zT7h zeg*V^8K4(z1KYt4uoJur{2(4K8tv2MH_#skyEXky^aCKE>H2ua1VID|Oi+`jZ(y_a zTSx<5f@34lZJQu>l0NKxEhJxLG7X|rp`J6VU5!}$|1kuQq*tn?Io~HJwcX5m)-%F_ zxuViK%11>PcZw$Ux7Ko|+B0skV4*1O!Q%UIAldI2_H_XAL7)tK^3pkk!{7)w3P!lM zHj@H#7A!&FCJUoGrr#sl1^2hMJ+>UT&sfjR*2P%g%$u#}d78BvavJ2tildodbU3B+ z2(pXsaB)Nj)-O)p zur@rRq_8qR{!zLW6PtuZ0uvq|II>e@&ZM>1ro%6ccv4sqU;i+dhsVqKiHA8#S+h*< z5#1SmS&44yZN97Qa%^Y*xkI69QRJen(G+{hy)Btsw$9{!n>%)@w6Z>zM{I6>ao%Dc zC=MtcNEkV&`sf2xe@7d$Fnaf<8O%Jg&dKfhHkn>>yV2p#Z#Prvn+g!gms!X;#EOg8 zjU{GS=6TD@{l3rcb)4C^?|?u1*0)O$|-fCDM?han&lDT{%Id_r%ghoh(fU`2&P!^iEAThYyqHsawl3dh z@9Vw(js9&rT?`Q;mfrjPr^?2=w{yk*f!{Ax zT~&YW&X7_KbE~SG7CiafRWo?Q!D(~63#%8_Rc-QBbagKDRaDn_yDDnEo17JOURPK3 z=2|Cy>m*@_|9EZ@w;f*1@0@#@hXbAJ@gbiS+@BFt#NaWJdoS2j+u=JbbRv+b295@p zax%=r$Ld+H8ael9Je4G0pLTapAy>u delta 68 zcmV-K0K5Nyzy*N71&|v7l93!k0g|y`p$`)ervL^F0{{=`55Eip49X0r3>>o|AomIc a3>*OXvkw~$0R({v1_gs49Je4G0pLTubQ0nK