Resolve merge conflicts

gcivil-nyu-org · Nov 19, 2023 · ee33dc5 · ee33dc5
1 parent a46b1f9
commit ee33dc5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/furbaby/api/serializers.py b/furbaby/api/serializers.py
@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from .models import Users, Locations, Pets
+from .models import Users, Locations, Pets, Jobs
 from django.contrib.auth.hashers import make_password
 from django.core.exceptions import ValidationError
 

diff --git a/furbaby/furbaby/local_settings.py b/furbaby/furbaby/local_settings.py
@@ -19,7 +19,7 @@
 
 os.environ.setdefault("FORGOT_PASSWORD_HOST", "http://localhost:3000")
 
-load_dotenv("/Users/yaminaik/INET-Monday-Fall2023-Team-1/furbaby/furbaby/.dotenv")
+load_dotenv()
 
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -92,9 +92,9 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": "demo1",
-        "USER": "yami",
-        "PASSWORD": "yami",
+        "NAME": "postgres",
+        "USER": "postgres",
+        "PASSWORD": "postgres",
         "HOST": "localhost",
         "PORT": "5432",
         "ATOMIC_REQUESTS": True,