summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Xaml
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-04-24 15:37:51 +0900
committerKangho Hur <kangho.hur@samsung.com>2017-07-10 11:11:23 +0900
commitf823b1f41d283fcde1e385b515f8b7a5b902d028 (patch)
tree9a3dc736ba11b3f0475a8699265e2f9c53cac8fe /Xamarin.Forms.Xaml
parent2e7be85cf19c1db5417b3ea030428413b26bc46c (diff)
downloadxamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.gz
xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.bz2
xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.zip
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 5b4fabb4..14e0b8be 100644
--- a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -64,4 +64,4 @@ namespace Xamarin.Forms.Xaml
return resource;
}
}
-}
+} \ No newline at end of file