# Conflicts: # collect_information/types/subPages/projectManager/myProject/index.ts  | 
			||
|---|---|---|
| .idea | ||
| collect_information | ||
| policeManagement | ||
| policeSecurityServer | ||
| securityManagement | ||
| superManagement | ||
| .DS_Store | ||
				
					
						# Conflicts: # collect_information/types/subPages/projectManager/myProject/index.ts  | 
			||
|---|---|---|
| .idea | ||
| collect_information | ||
| policeManagement | ||
| policeSecurityServer | ||
| securityManagement | ||
| superManagement | ||
| .DS_Store | ||