From 5e637bc70f019061bf3ca45e519ea674b40dcbcc Mon Sep 17 00:00:00 2001
From: siqi <me@siqi.fr>
Date: Thu, 4 Jul 2013 23:46:30 +0200
Subject: [PATCH] conflict

Change-Id: I70fe3777885b3a07f813a0222d5559382cfc657f
---
 ios/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 ios/.DS_Store

diff --git a/ios/.DS_Store b/ios/.DS_Store
deleted file mode 100644
index 4e262b151d7a0188c70da5f83a1780ea594d6a9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK&u-H&9R4{iBZE!qWfGi-IB}?^4l2ZfLnti*2?Saz?ZBWUO`u^}T$+>)N<|)s
zhu{G?BOZVU;0?;>KS)a&4!a;U`B&MWWB<ON<Ik~O6A|mof<2-J5!pxr>z9yKm}nPi
z%`9CbcudCNbW8*CXi9I^yiJ8sz$oy)DInJFHM&nTN-3k$>o>&nkRDS+KGt(cPw6#&
z5sgqDVvSGm+r@f6dKB}KA9Ej(u#K=Ez#A)Ra<EsaM<?Kn&_@QIPqB<p9l0W+^|BOk
z3;YxG9^$<syg^8bj2su=gdUW5oABlsrx?vKN*RSE#y7!0VyhK$q6&sTPbYe`U;IfN
zrCF=>omsW|g^i0gZ0qnKN&-Ib@L3Y1&--IO??*xCd(#)PoO#(S?RZn!^32P|Xp!Xs
z=P}BM+WR01vhlF7vskp7PHWk87JKbmx0}wL_RZyT6V~`@?_A%#`*7fW__+AAl<!Ln
z`>?cajep=X3KgSy-=8KiPsDC5m^MAZ3>`rqG1Hi*qCVD7_?({GZTNEvFtch-mA(~o
zSbJMyTJ(;*Vsy4&^4Xw$d^`83i(Yy~-`cN|FCLAZQ33s}*q6`9GwwzKqrmxBK<p0=
zl0a8uu260r$mA6OSVy%ql*L^_a2$=U##|v<U`$bgipumAgDE=d9qs38%oQp+F@5=9
zx@V?uC`|T__>OcZ<|;I~QNSorRG_9F8{+)${r&!5B$+3pfKlLFDZuL8ez$`m>9cih
yaN?|WkX|7P6MnfuNkOKMV_6VK@f9R#XmdmX=xWRrq6TLE2uK-BW)%3R3j78lPQOk7