summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Xaml
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-04-24 06:37:51 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-10-23 04:34:33 (GMT)
commit8da18bbae98cae2749fbbf50344458f82f4fbceb (patch)
tree03e3fd4be3fd3e182030d015350defb64475584f /Xamarin.Forms.Xaml
parentb70ccb89c33c96438d6f2c5159e278d9d0dfd761 (diff)
downloadxamarin-forms-8da18bbae98cae2749fbbf50344458f82f4fbceb.zip
xamarin-forms-8da18bbae98cae2749fbbf50344458f82f4fbceb.tar.gz
xamarin-forms-8da18bbae98cae2749fbbf50344458f82f4fbceb.tar.bz2
rebase to tags/beta-2.3.5-pre1
- this is base code of xamarin.forms 2.3.5-pre1 (https://github.com/xamarin/Xamarin.Forms/commit/fc778eb9789f50634d48fb9ad127f211b3fcfcc7)
Diffstat (limited to 'Xamarin.Forms.Xaml')
-rw-r--r--Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
index 8d33d05..c2137ec 100644
--- a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -86,4 +86,4 @@ namespace Xamarin.Forms.Xaml
return resource;
}
}
-}
+} \ No newline at end of file