Merge pull request 'Merge tim's todo' (#1 ) from tim into main

Reviewed-on: #1 Reviewed-by: David Moody <david.moody@penta-inc.com>
Merge branch 'main' into tim
2025-10-21 15:42:42 +00:00 · 2025-10-21 10:42:00 -05:00 · 2025-10-21 10:41:51 -05:00 · 2025-10-21 10:41:51 -05:00 · 2025-10-21 10:41:51 -05:00 · 2025-10-21 10:21:38 -05:00
2 changed files with 4 additions and 1 deletions
--- a/README.md
+++ b/README.md
@@ -6,4 +6,6 @@ This README takes the place of the usual spots on the public.dillerdigital.com s
 # Day 1 Resources
 - [Our class repository on the Diller Digital git server](https://git.dillerdigital.com/DillerDigitalStudents/DD-SWNG-20251020-V)
 - [Help for SSH errors](https://docs.gitea.com/help/faq?_highlight=ssh#ssh-common-errors)
- Command to list all the files in git repository under version control:  `git ls-files`
+- Command to list all the files in git repository under version control:  `git ls-files`
+
+# Day 2 Resources
--- a/todo-tim.txt
+++ b/todo-tim.txt
@@ -0,0 +1 @@
+- update the branching diagram
Author	SHA1	Message	Date
Tim Diller	bbb2439ac8	Merge pull request 'Merge tim's todo' (#1 ) from tim into main Reviewed-on: #1 Reviewed-by: David Moody <david.moody@penta-inc.com>	2025-10-21 15:42:42 +00:00
Tim Diller	bfd9f0b76e	Merge branch 'main' into tim	2025-10-21 10:42:00 -05:00
Tim Diller	63b45ccee1	add text to tim's todo	2025-10-21 10:41:51 -05:00
Tim Diller	3ddfe0f467	add a tim todo	2025-10-21 10:41:51 -05:00
Tim Diller	8eb5d23663	add a Day 2 heading	2025-10-21 10:41:51 -05:00
Tim Diller	dba876bc67	Merge branch 'main' into tim	2025-10-21 10:21:38 -05:00
Tim Diller	6ab83dc96e	add section for Day 2 resources	2025-10-21 10:17:53 -05:00
Tim Diller	5fc5aa5e96	Merge branch 'tim'	2025-10-21 10:04:44 -05:00
Tim Diller	8d17088dd6	add a Day 2 heading	2025-10-21 10:03:45 -05:00
Tim Diller	701e3861b3	add text to tim's todo	2025-10-21 10:01:51 -05:00
Tim Diller	f25795c861	add a tim todo	2025-10-21 09:59:10 -05:00