From 6574832104520b4eeaae98b8e594806a18d6abe3 Mon Sep 17 00:00:00 2001 From: jrm_u <jrm_u@LAPTOP-LPR2PDQS.ern.nps.edu> Date: Thu, 29 Jul 2021 09:22:54 -0700 Subject: [PATCH] Merge origin/master Conflicts: assignments/ReportingForDuty.md --- assignments/ReportingForDuty.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assignments/ReportingForDuty.md b/assignments/ReportingForDuty.md index c45dcff869..249fecfaf2 100644 --- a/assignments/ReportingForDuty.md +++ b/assignments/ReportingForDuty.md @@ -27,6 +27,8 @@ More information on your use of Git is in the parent directory [README.md](../.. - Max Schlessel +- Justin McNeely + ### 2020 - Bernd Weissenberger -- GitLab