Fakultas Ilmu Komputer UI

Fixed merge conflict and updated README.md

3 jobs for update_fasilitas in 7 minutes and 6 seconds (queued for 1 second)
Name Stage Failure
Pylint Linter
    for name, filepath, modname in file_descrs:
File "/usr/local/lib/python3.7/site-packages/pylint/lint/pylinter.py", line 960, in _iterate_file_descrs
for descr in self._expand_files(files_or_modules):
File "/usr/local/lib/python3.7/site-packages/pylint/lint/pylinter.py", line 969, in _expand_files
modules, self.config.black_list, self.config.black_list_re
File "/usr/local/lib/python3.7/site-packages/pylint/utils/utils.py", line 150, in expand_modules
modutils.modpath_from_file(something, path=additional_search_path)
TypeError: modpath_from_file() got an unexpected keyword argument 'path'
ERROR: Job failed: exit code 1