From a32f66ca0c76285b7f2637a209b0763759642053 Mon Sep 17 00:00:00 2001 From: 72ridwan <rachmat.ridwan72@gmail.com> Date: Sun, 10 Sep 2017 01:16:49 +0700 Subject: [PATCH] Fix bugs in urls of praktikum and lab2_addon --- requirements.txt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5a123f7..7cfdc78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,4 @@ -<<<<<<< HEAD coverage==4.4.1 Django==1.11.4 gunicorn==19.7.1 pytz==2017.2 -======= -astroid==1.5.3 -colorama==0.3.9 -coverage==4.4.1 -Django==1.11.4 -gunicorn==19.7.1 -isort==4.2.15 -lazy-object-proxy==1.3.1 -mccabe==0.6.1 -pylint==1.7.2 -pytz==2017.2 -six==1.10.0 -wrapt==1.10.11 ->>>>>>> 5bb6d5d0f04a4f50a5e86d6d2a7c3cbe178b38aa -- GitLab