From 18b7f7728408338a3230b5b2f65f9d4cc5764576 Mon Sep 17 00:00:00 2001 From: acidburnmonkey Date: Wed, 6 Aug 2025 01:44:37 -0400 Subject: [PATCH 1/2] new file: .gitattributes --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..55ce861 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Never merge settings.py - always use branch version +settings.py merge=ours From d5e0fc56c30a30d57759964a04ec81db9a04ad6a Mon Sep 17 00:00:00 2001 From: acidburnmonkey Date: Wed, 6 Aug 2025 01:50:53 -0400 Subject: [PATCH 2/2] ' ' modified: mysite/urls.py --- mysite/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mysite/urls.py b/mysite/urls.py index ac4937d..ccb8c56 100644 --- a/mysite/urls.py +++ b/mysite/urls.py @@ -5,6 +5,7 @@ from .views import Doxme, home, robots urlpatterns = [ path('home/', home), + path('', home), path('robots.txt/', robots), path('doxme/', Doxme.as_view()), ]