From 6094e529511a654920e951507186962ff2847d18 Mon Sep 17 00:00:00 2001 From: Tobias <tobias.brennenstuhl.gy@nps.edu> Date: Mon, 9 Sep 2019 22:05:06 -0700 Subject: [PATCH] Merge origin/master Conflicts: assignments/ReportingForDuty.md --- assignments/ReportingForDuty.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignments/ReportingForDuty.md b/assignments/ReportingForDuty.md index a9e8f574de..63133c27db 100644 --- a/assignments/ReportingForDuty.md +++ b/assignments/ReportingForDuty.md @@ -24,4 +24,4 @@ More information on your use of Git is in the parent directory [README.md](../.. - Bert Knobeloch -- Tobias Brennenstuhl +- Tobias Brennenstuhl aka Sir Tobi -- GitLab