Fakultas Ilmu Komputer UI

[CHORES] Added some file from branch PBI. I dont know why it was merged into...

[CHORES] Added some file from branch PBI. I dont know why it was merged into my branch instead of the other way around. Fixed merge conflict on settings.py
2 jobs for bimo_oauth in 30 minutes and 33 seconds (queued for 10 minutes and 14 seconds)
Name Stage Failure
failed
UnitTest Test
  File "<frozen importlib._bootstrap_external>", line 724, in exec_module
File "<frozen importlib._bootstrap_external>", line 860, in get_code
File "<frozen importlib._bootstrap_external>", line 791, in source_to_code
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/builds/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/poipole-dtb-beasiswa-miskin-dan-disabilitas/pplbackend/settings.py", line 43
<<<<<<< HEAD
^
SyntaxError: invalid syntax
ERROR: Job failed: exit code 1