Fakultas Ilmu Komputer UI

Commit 36a5684f authored by BIMO IMAN SMARTADI's avatar BIMO IMAN SMARTADI
Browse files

[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
parents eebadb9c c219442a
Pipeline #32834 failed with stage
in 30 minutes and 33 seconds
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class LoginConfig(AppConfig):
name = 'login'
from django.db import models
# Create your models here.
from django.test import TestCase
# Create your tests here.
from django.shortcuts import render
# Create your views here.
......@@ -40,13 +40,19 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'helloworld',
'oauth_app',
<<<<<<< HEAD
'rest_api',
=======
'login',
'registrasi',
>>>>>>> c219442ab5972becfd743cdf141e16878dbeb398
'rest_framework',
'allauth',
'allauth.account',
'allauth.socialaccount',
'allauth.socialaccount.providers.google',
]
MIDDLEWARE = [
......
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class RegistrasiConfig(AppConfig):
name = 'registrasi'
from django.db import models
# Create your models here.
from django.test import TestCase
# Create your tests here.
from django.shortcuts import render
# Create your views here.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment