From d512d06b272ffea363c057ea9b9104bced398b3c Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Mon, 28 Sep 2020 20:29:41 -0600
Subject: [PATCH] Fix merge conflict?

---
 app/application.js    | Bin 215 -> 432 bytes
 app/soapbox/common.js | Bin 422 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/soapbox/common.js

diff --git a/app/application.js b/app/application.js
index 906247ea3ef9529bcce19d5c13f4ed09c8b96735..910d2af8d507b149196e1ae5ef6a977398abe6eb 100644
GIT binary patch
literal 432
zcmbVIL2kn^47=wQzS#yA`vFCVK4Cu?R7Y-&+EFGeScjp1pIabpHtf`cE)+#lOl2Y#
zl?jG7%3m?%TvcQ$N;_W(rahhgb^AUoYrW|@#*aBM8XbvGJ$z!Nf<Dyh*MMt)why`s
zGzy-@H0@O2fYs|4B|PJbWb`gJT58-Wg%h%8gdqJNa7a~}*_!C~P_dUI7Ie3p#s8l6
zY2^ZfoFM<F-u)`iSl1Ga##ps|Ro|UbclSr31=6Uk8!*D0#kB7))&-DoG`O6#|0`v5
M$V_am4PDy&0FFMGnE(I)

delta 60
zcmdnMe4TNEnPFybL4Hw*LbXD1Ng|N0RY)t!&s9*@(=X0XEJ(_)&`-|K&CSnKx8~vk
LtI(M2z*qnPk=_*G

diff --git a/app/soapbox/common.js b/app/soapbox/common.js
deleted file mode 100644
index b0c6f87d87b2fec056ae4690eba445aa7ee6f7b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmb_YJ8r`;4Bd4KZgPNHI)Im~U3&vnp%NyRm68;apvc`TI~j}&nYt102fk;kAc!(W
zwSzH~&xIAf0*wNRO9spH-PfbcJYE+*)hQ~KsW}5{w}D>+!1z;%v9qc0sSg*FlF>&I
zzXn_b>}FW&x2a4@u}o)*CuGkUqV_M~jzn9~TIjxmV6O+v=oZg^X6K;D6vnstu05@I
z)y_KSDTh6Zw;!Nfu~lpxm2b;7@R-y+_nPb9AqI^H=<qQgfcNm38aj@+1HDkhS!V8o
F`2(~Lkd*)c