From 1ec600435155a388b710df9d838a0ff25515319c Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Thu, 24 Feb 2022 17:37:19 +0000 Subject: [PATCH] Resolved conflicts --- resources/osd/vision.png | Bin 12591 -> 12710 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/osd/vision.png b/resources/osd/vision.png index c21f79f2a519a77550ad58c719eaf73f41a10e47..0b4cb28958c5f8a9065705fb03c89e08524301f4 100644 GIT binary patch delta 5160 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 fB%Enruvn-Ps9HQ8(=|Z delta 4980 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�d^%98oBu@Nv*EhIUEVI#&K(_lmCNQKVa zNG^1GBq9|S?2QwD(^%P+fl>%PmlgBo!2gC!qk@a|mvdvGp447!8K9+*SU7H&8pzBw zlM9#s`+F05f((*&UiHgdHz*%vJhU6SXHUxUN>P)ZjXSb;XGh_!1!t7_xIom&22mY<+mo8pO?%qryl&?qB;~eUU$H!p!~3t zq1emK*P9RRG@m#8lE17pBc2e|{c1lryub(ZJc-?h8Ko`j9?=!mZ6s#J*{NPHL%ed9 zbT3S|#ZDvtTpfR%?@U%;cX$DYrq|cLI zM;+R;qh~ee+2E#?-~QxC8a=ctmG~o;eN~4eUWy>TYhB^cAarP#Gpr(Ww(yC<|0_=2 zny2jxMheUeo=Q`jbm(KKmbt!v2@fV(!(+7gJSdmQxnIpato+fA76Wt3Ji&S8*tbJ1 zvo`UWE)_16@UE%WiKxZxz-MJb&{wJX9oJbESFyKqfAEH{U4iZd*U*Lq>kyeMny(Ck z2TRqTUce{XPXn~T@W0oNF?m7cV<{8!gh8puN}2|!+-G^dKDnCzGsdTCzbZiU&BeV} zvpvADhSY2aWk%^poa@ayKchnRUA3d8bOy1}M_bQ_1i9s3IK|EcA6Ei&RFV1~20p5) zManUA(ecXsVN|j5TV{E#ZiyWL{?anv&JJWRg%XCM+O?d(k8j*tUflplNxn}^*=lve zT$5K-73|BZ^*6Dl+*#wsxs?I`N$C_77(f6V$~t43!hE>+A78G;F#9Bua%9Cl{gMHu zMWgr(y-qAcK6NvKKrsdmAG?_o&I0Ooj8%>tnX5h5yemc8u|ic{11N3zZ~n|!%5 z@;WU{jj#=u-Y9sO#_&4o_~f{G8nbi_uwSydYn#z~Zq?2#^+B^lA+{eO(^K7m#a?$)MtB-_$YHN|rGhr!02!Zyhk?+IFtA_g=G|@`Q z*O?2WKU1b+EWrWTL`^sLCxCUffMPfj!xcvv(}Q147I$T-^n0-Up{bVU+4aWS@MqKk zaQ$Ls`-RnrHJ&PLbm>Rf+o&Jx%C$YGPKJcSyq_N=_mwNSLbhL(t&fk!iH3ZT$)W`) zk3u#2n75ZX6(Fp5lqSr2Ej1@Mg>KLxKrY#LNUO+w+&xTkkavSQIQ@N(I0!SzXgbS@ z`3;|~cOo1f?6fM7`>-jAd7txGQW)>^XGDb84MynO4&8QDHu@a3;1)XaT`TUF_qr0Q zuf~ytfFi(|2LM+5@2zmsN7(NtyfiN#dOk9r6%Sc*nQQMA$rRkS5!sv(`F=r>Rn4nK z+>q0jgcBp41Ob`BH#X#=i{Rt2R~vwZ%V?cpAj3e&$x}f355SGv&u$=;!&>0 z+`nS)G9c2h#xp*>V#@n+{E2qm$-9ID#yS_hKMKW1O)-NIv{7?0$mCeyf-}m`XL`b` z8JnEUIxtKQ-N*8j916Y;VXn6^y4voG7Thcb8zjwLEYl=T4ne!XaY&huhIlwH;}-c% zfKKpk+jb&-O}&N^yEfEBgsgbYdH<#1c)XsL0#D z*qX0vweiVD=f`h6t8yb5*zk`1gz;#%N^1Q(i{STwRdo!dN~-BTd=v4Nz@0Tp4#ri5 z70B;ZNnOn7kLGr8N(u2@BJ$ArnLfzN>We}Hi4))-J2X3<;(^9^9jO$NUQMA;dB&l;g1372Qks>+Ws6ygTFBfzHCz K#-!TFHU3}W)#TX#