Fakultas Ilmu Komputer UI
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ppl-fasilkom-ui
2020
PPL-C
DTB-Layanan Fasilitas Publik Penyandang Disabilitas
PoiPoLeGan-PPLapanganTembak-DTB Layanan Fasilitas Publik Penyandang Disabilitas-BE
Commits
492a5334
Commit
492a5334
authored
Apr 18, 2020
by
Bimo Iman Smartadi
Browse files
Fix merge conflict
parent
4156641c
Pipeline
#41896
passed with stages
in 66 minutes and 52 seconds
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
informasi_fasilitas/migrations/0001_initial.py
View file @
492a5334
<<<<<<<
HEAD
# Generated by Django 2.1.5 on 2020-04-17 13:50
=======
# Generated by Django 2.1.5 on 2020-04-17 10:26
>>>>>>>
staging
# Generated by Django 2.1.5 on 2020-04-18 09:06
from
django.conf
import
settings
from
django.db
import
migrations
,
models
...
...
pplbackend/settings.py
View file @
492a5334
...
...
@@ -41,10 +41,6 @@ INSTALLED_APPS = [
'django.contrib.messages'
,
'django.contrib.staticfiles'
,
'django.contrib.auth.hashers'
,
<<<<<<<
HEAD
=======
'login'
,
>>>>>>>
staging
'registrasi'
,
'informasi_fasilitas'
,
'new_rest_api'
,
...
...
registrasi/migrations/0001_initial.py
View file @
492a5334
<<<<<<<
HEAD
# Generated by Django 2.1.5 on 2020-04-17 13:49
=======
# Generated by Django 2.1.5 on 2020-04-17 10:27
>>>>>>>
staging
# Generated by Django 2.1.5 on 2020-04-18 09:06
from
django.conf
import
settings
from
django.db
import
migrations
,
models
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment