C2021-059 Attempting to resolve conflicts try 1

2021-059 - Matchicng Paul's Changes
C2021-059 - Update designer to avoid conflict
2024-08-01 14:52:38 -04:00 · 2024-08-01 14:49:14 -04:00 · 2024-08-01 14:41:34 -04:00 · 2024-08-01 11:01:28 -04:00 · 2024-08-01 09:23:30 -04:00 · 2024-07-30 08:54:13 -04:00
344 changed files with 3692 additions and 4474 deletions
@@ -1,6 +0,0 @@
-# ---> VisualStudio
-## Show diffs for xml files in GIT
-##
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitattributes
-
-*.xml text
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Laskey	c05e493579	C2021-059 Attempting to resolve conflicts try 1	2024-08-01 14:52:38 -04:00
Kevin Laskey	2714973c16	2021-059 - Matchicng Paul's Changes	2024-08-01 14:49:14 -04:00
Kevin Laskey	5f86d8c629	C2021-059 - Update designer to avoid conflict	2024-08-01 14:41:34 -04:00
Kevin Laskey	977ea6f5fc	C2021-059 - Update proms sql fixes with correct numbers	2024-08-01 11:01:28 -04:00
Kevin Laskey	a8bbda1281	C2024-005 - Completed some updates for nested folder selection (parent unselect)	2024-08-01 09:23:30 -04:00
Kevin Laskey	da1b061eb1	C2024-005 - Added orphan record clearing progress bar, confirmation message	2024-07-30 08:54:13 -04:00
Kevin Laskey	4644699df0	C20240-005 - Deleting Folder additions	2024-07-29 15:57:54 -04:00
Kevin Laskey	6e6abbd759	C2024-005 - Kevin working on folder retrieval	2024-07-22 09:28:48 -04:00