merge remote branch into main

Update mdwalters.conf
2024-04-30 14:55:20 +00:00 · 2024-04-30 14:54:58 +00:00 · 2024-04-30 14:54:17 +00:00 · 2024-04-30 03:30:24 +00:00 · 2024-04-29 08:24:22 +00:00 · 2024-04-29 08:14:30 +00:00
1 changed files with 3 additions and 0 deletions
--- a/mdwalters.conf
+++ b/mdwalters.conf
@ -14,6 +14,8 @@ server {
        proxy_set_header X-Forwarded-Proto $scheme;
    }
 }
+<<<<<<< HEAD
+=======

 server {
    listen 443 ssl;
@ -48,3 +50,4 @@ server {
        proxy_set_header X-Forwarded-Proto $scheme;
    }
 }
+>>>>>>> 5e8ad9b7dac2d5b03fc4e34877020b7850ec65a3
Author	SHA1	Message	Date
mdwalters	d27ee73418	merge remote branch into main	2024-04-30 14:55:20 +00:00
mdwalters	1a0efef77d	merge remote branch into main	2024-04-30 14:54:58 +00:00
mdwalters	98ff0c27f2	Update mdwalters.conf	2024-04-30 14:54:17 +00:00
Max	34d16bfef0	Merge branch 'main' into main	2024-04-30 03:30:24 +00:00
mdwalters	edee02cd5b	Update mdwalters.conf	2024-04-29 08:24:22 +00:00
mdwalters	3c8a158bad	Update mdwalters.conf	2024-04-29 08:14:30 +00:00
mdwalters	bc00c4509b	Update mdwalters.conf	2024-04-29 08:13:14 +00:00
mdwalters	665910d7b3	Update mdwalters.conf	2024-04-29 08:00:05 +00:00
mdwalters	5672940953	Update mdwalters.conf	2024-04-29 03:59:35 +00:00
mdwalters	9f506b0271	merge remote branch into main	2024-04-29 03:59:01 +00:00
mdwalters	c8dcef66f6	merge remote branch into main	2024-04-29 03:38:02 +00:00
mdwalters	f539bcc1b6	Update mdwalters.conf	2024-04-29 03:37:04 +00:00
mdwalters	fc0dece1d2	Update mdwalters.conf	2024-04-29 03:19:42 +00:00
mdwalters	78fcbb17c4	Update mdwalters.conf	2024-04-29 03:16:02 +00:00