resolve merge conflict

README.md

@@ -2,7 +2,7 @@
 
 ### This is a Django practice app that will render bios and work samples for the class
 
-### TODO for each student
+
 - Remember to work in a branch
     ` git checkout -b <branch name>`
 - Create a url, view, and template specific to you.

core/settings.py

@@ -11,7 +11,6 @@
 """
 
 from pathlib import Path
-import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -121,7 +120,6 @@
 # https://docs.djangoproject.com/en/3.2/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field

core/urls.py

@@ -15,13 +15,8 @@
 """
 from django.contrib import admin
 from django.urls import path, include
-from students import views
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('accounts/', include('registration.backends.simple.urls')),
-    path('crodri/', views.clarissa_page, name='clarissa_page')
 ]
-
-urlpatterns += staticfiles_urlpatterns()

students/models.py

@@ -6,4 +6,4 @@ class User(AbstractUser):
     name = models.CharField(max_length=200, blank=True, null=True)
     email = models.EmailField(blank=True, null=True)
     phone = models.CharField(blank=True, null=True, max_length=14)
-    skills = models.TextField(blank=True, null=True)
+    skills = models.TextField(blank=True, null=True)