# Conflicts: # Assets/Scripts/DisplayServer.cs # UserSettings/Layouts/default-2021.dwlt |
||
|---|---|---|
| .. | ||
| BroadcastServer.cs | ||
| BroadcastServer.cs.meta | ||
| DisplayServer.cs | ||
| DisplayServer.cs.meta | ||
| TouchClient.cs | ||
| TouchClient.cs.meta | ||
# Conflicts: # Assets/Scripts/DisplayServer.cs # UserSettings/Layouts/default-2021.dwlt |
||
|---|---|---|
| .. | ||
| BroadcastServer.cs | ||
| BroadcastServer.cs.meta | ||
| DisplayServer.cs | ||
| DisplayServer.cs.meta | ||
| TouchClient.cs | ||
| TouchClient.cs.meta | ||