From 98b0307fb48984cbfc249b52cad4313321c3d16d Mon Sep 17 00:00:00 2001
From: salsahava <1shavaqabitta@gmail.com>
Date: Sun, 11 Oct 2020 11:58:52 +0700
Subject: [PATCH] Fixed conflicting migrations

---
 app/migrations/0022_merge_20201011_1122.py  |  14 ++++++++++++++
 digipus/__pycache__/settings.cpython-36.pyc | Bin 3557 -> 4123 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 app/migrations/0022_merge_20201011_1122.py

diff --git a/app/migrations/0022_merge_20201011_1122.py b/app/migrations/0022_merge_20201011_1122.py
new file mode 100644
index 0000000..4b0d5eb
--- /dev/null
+++ b/app/migrations/0022_merge_20201011_1122.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1 on 2020-10-11 04:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0021_dislikecomment_likecomment'),
+        ('app', '0021_materi_release_year'),
+    ]
+
+    operations = [
+    ]
diff --git a/digipus/__pycache__/settings.cpython-36.pyc b/digipus/__pycache__/settings.cpython-36.pyc
index 0857014007c24fe96681cc07b645936f81fe7ea1..bbd092036ce26932962c8c236860e7899ca31f6f 100644
GIT binary patch
delta 1239
zcmaDVJzGK9n3tF9RC`mrgct+EV+JH3z`(%Zz`(#zoHkKe*(rrFg(ZhImo18&ks*~a
zizAB@iR4P<Ze|3*D4tZ76xL?ODBe_-6t+~p6!u=GDE<_VbjB!wiFGpdDdH&-=>k!L
zDUvBtDbgu2DY7YYDe@@_DN^a2Q9>z-QNk%oQ6eeIV6#P2c~VrGnbH|k6jM}F)Kb(_
zG*UFvSuz<@wC1p+Ge(J}Xh(^svZUyw@}=me==Cy3Nu;u*=)-xEsVpf5aGq4E#Dsdr
zBE1yD6r)s@6ys*bRF)JIFlh=V&A_C2ibXS1isc-(OvWhbyqr|Y35-QynG8|Vsf<}N
zDOSylQL?E_S#qheDb^`Ay-canDTX!-c`m6^6Bvt{!0K31tWxEn4nk8~4^}LZVwhqJ
z_n}=gQ;Pi@CXjV-F^6WRG{z`}6vrsV6sHvDOvV(a6c;e*3MSn$8Pi#!lv3QIlv6yS
zR8kb9R8thA)KV0q)Kl5B_)|Pn*|Rjjq-Kg&Dtnezigzk|mUc?LPbO=WPAW@^Z;D@v
ze=k#%ZYoPkKuRE(tp~S0sF^8BKP5QI09hoRG0HF{B+3Xb7TU}dWt<WgWs(veWttKZ
zWtI||5|z%F$rxpx!W7J)8J(!Z$iTqml9ia3p07}xT2hj^*^fz|kyn%P7H4vPUU5lc
zUP<xhTINZN0#STLsl_GnX+?>-spa`a*_-)UKQb}0O=jd!X5^Wy%5jN}mw|zyh;Q;=
z4mC!;%_^L#jP+Gqi8-l7CAyh;Y57&W5O#5Ca&l^MF^pTDSd^EUmtMsKkxfa=OHVC|
z5_I?XclU9P4{~+(a101>_HeAyF!M?EtZ+;YaRdQ(cil2KPs5PBpzsRcC_lH-{46h%
z@XR!?@KjC4A|3_?hA2U2D<4l+zYrutqEHR-N{$K(Dy;O#FgFbK^>lUj3yk-T$jXfJ
z&hVV<$(0owCFkPm<{0V|67Luq;^FES;_2)d;_2@f@9g6k9PAogWr-Rj@x__B1v#l%
z<t2KFr6n1uc_o?2i6xo&d3s*qA&w{_nii9{a_KTfiBC3U6X!2tW?*2r#gUs@T%4Gm
zT0Hp?mo5(rNQfmVKR>64b+a_L4Py$6r=OeuE%xA0XJ^;o;9KnBjzNB&e(tweU4w%B
zgQ9qRU4w%i-Cg5D9NmMXq!A$q3BdSZSLYztka%y`$S6rnNzV{hkksTbo?6K$z984&
zka)KsM_<=){~+&`3`N$UxV4^qhbLBS9|Hpe3lj$u2O|$753>wA2Qv>78{6bSUWv)^
oylj&*d2<z+*%%>^i<yU!hn0_sg;{`!g^7=mg^7iUg_(&F08_nCH~;_u

delta 662
zcmbQO@Kjpan3tDpyJtgur!WJ<V+JI^&%nUoz`(#zEHY79*&>xOi#3Z4iDXaZXl4Y#
zD9%)t6qaVjD6UkN6xLMk6t-TbD4rDdbjB#&6po1<GWF^FQG6-lDH17?DN-rYDKaUt
zDRL<i>6}sgDe_SQDGE`7DT-i|g;F_Fl$x2+8B^p_lv7kvR8!Pa)YDlq8B;Xou%t6a
z38!dAiKMcmXr*$eXs77(GDnG~vZUz3d19$7DSB|8c&g|G#v+B3di@lGRF)LOX2w*O
z6eBQc3?@y$q-ly-GgFHB9JWlxD2cqBRIv$+MIM<9Q4*<)S&}Ih&5Th}sZ3eYsZuGH
zDOSBqsS+vrHVk<#sp1nDi%P)iSW+xfWuOkiqP9LyB1J#N8ty}zW~LO|IZPny;9_>o
zOlgc!vMKgaaw!fej+u-p4k=Dx(iu#;WHP3+M9HVPMk%DYMJcApM=7PqM=7VsN2$Qg
zaBpUcQcdxQQbQI=XN*!+Pw|Y>fD3vxGev2pct>fa_(W-^_(tiZFa<Mc`fcuGa%9|m
zhj|j?<~r7oOpL6P3pkV+xhGHIxWvZ8z`#(%J2{6_jgfcrWKLDa$%WimOq#lrEqHV%
z_wwlSFf%YP++s<}&(A4h*?f%0hH-K_Uk&F<h9XmtPSeSM_+mv?FfcH%FmW((F!C_V
guyZi;FtM>sF68gzXX9gHVHRLwVd7(CVPatd0HINzasU7T

-- 
GitLab