diff options
Diffstat (limited to 'Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs')
| -rw-r--r-- | Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs b/Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs index c3c4192..fd70270 100644 --- a/Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs +++ b/Xamarin.PropertyEditing.Tests/CreateResourceViewModelTests.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -<<<<<<< HEAD using System.Linq; -======= ->>>>>>> [Core/Win] Create resource core/window using System.Threading; using System.Threading.Tasks; using Moq; |