jsuarezruiz
/
FormsCommunityToolkit
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
35 коммитов 5 Ветки 0 Теги 7,3 MiB
C# 97.6%
PowerShell 2.4%
Перейти к файлу
Bart Lannoeye da6e8c7d57 Fixing merge conflicts 
Conflicts:
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.Droid/Effects/ChangeColorSwitchEffect.cs
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.Droid/FormsCommunityToolkit.Effects.Droid.csproj
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.Droid/packages.config
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.UWP/FormsCommunityToolkit.Effects.UWP.csproj
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.iOS/FormsCommunityToolkit.Effects.iOS.csproj
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.iOS/packages.config
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects.csproj
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects/SelectAllTextEntryEffect.cs
	src/FormsCommunityToolkit.Effects/FormsCommunityToolkit.Effects/packages.config
	src/SampleApp/Effects.SampleApp.Droid/Effects.SampleApp.Droid.csproj
	src/SampleApp/Effects.SampleApp.Droid/packages.config
	src/SampleApp/Effects.SampleApp.iOS/Effects.SampleApp.iOS.csproj
	src/SampleApp/Effects.SampleApp.iOS/packages.config
	src/SampleApp/Effects.SampleApp/Effects.SampleApp.csproj
	src/SampleApp/Effects.SampleApp/Views/MainPage.xaml
	src/SampleApp/Effects.SampleApp/Views/MainPage.xaml.cs
	src/SampleApp/Effects.SampleApp/packages.config
 		2017-01-18 20:25:01 +01:00
.nuget PR feedback on unspecified 2016-12-15 13:24:20 +13:00
Effects Fixing merge conflicts 2017-01-18 20:25:01 +01:00
Effects.Android Fixing merge conflicts 2017-01-18 20:25:01 +01:00
Effects.UWP Fixing merge conflicts 2017-01-18 20:25:01 +01:00
Effects.iOS Fixing merge conflicts 2017-01-18 20:25:01 +01:00
SampleApp/Effects.SampleApp/Views Fixing merge conflicts 2017-01-18 20:25:01 +01:00
Effects.sln Revert "Try saving the Visual Studio settings!" 2017-01-12 00:09:32 +01:00