Resolve merge conflicts

MvvmCross / MvvmCross-Forms

Support for Xamarin.Forms on MvvmCross: The .NET MVVM framework for cross-platform solutions, including Xamarin.iOS, Xamarin.Android, Windows and Mac.

http://mvvmcross.com

6 stars 2 forks source link

Resolve merge conflicts #17

Closed martijn00 closed 9 years ago