Merge fixes

Author: linnealovespie

Samples/StyleTransfer/AppViewModel.cs

@@ -47,7 +47,6 @@ public AppViewModel()
         private List<MediaFrameSourceGroup> _mediaFrameSourceGroupList;
         private MediaFrameSourceGroup _selectedMediaFrameSourceGroup;
         private MediaFrameSource _selectedMediaFrameSource;
-        public int dummyFPS = 10;
 
         // Style transfer effect properties
         private LearningModel m_model = null;
@@ -57,12 +56,7 @@ public AppViewModel()
         private string m_inputImageDescription;
         private string m_outputImageDescription;
         private IMediaExtension videoEffect;
-        public readonly List<string> modelFileNames = new List<string>
-        {   "candy",
-            "mosaic",
-            "la_muse",
-            "udnie"
-        };
+
 
         // Image style transfer properties
         uint m_inWidth, m_inHeight, m_outWidth, m_outHeight;

Samples/StyleTransfer/MainPage.xaml.cs

@@ -28,13 +28,22 @@
 
 namespace StyleTransfer
 {
+
+
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
     public sealed partial class MainPage : Page
     {
 
         private AppViewModel _viewModel;
+        public readonly List<string> modelFileNames = new List<string>
+        {   "candy",
+            "mosaic",
+            "la_muse",
+            "udnie"
+        };
+        public int dummyFPS = 10;
 
         public MainPage()
         {