# Conflicts: # APT.MS.Data/Mapping/T4/T4Map.cs # APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/06OGConfigController.cs # APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs  | 
			||
|---|---|---|
| .. | ||
| Api | ||
| HomeController.cs | ||
				# Conflicts: # APT.MS.Data/Mapping/T4/T4Map.cs # APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/06OGConfigController.cs # APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs  | 
			||
|---|---|---|
| .. | ||
| Api | ||
| HomeController.cs | ||