From df35427c7ed7a5f6d77818ae82f0202b577462b2 Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus.cefet@gmail.com>
Date: Mon, 25 Sep 2023 17:58:23 -0300
Subject: [PATCH 1/2] feat: bump packages versions

(cherry picked from commit d7a39a7b1379d797c62324b7d0c36c2db5ae9d58)

# Conflicts:
#	src/Resizetizer/Directory.build.props
---
 src/Resizetizer/Directory.build.props | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Resizetizer/Directory.build.props b/src/Resizetizer/Directory.build.props
index 3980710a..b2bf2804 100644
--- a/src/Resizetizer/Directory.build.props
+++ b/src/Resizetizer/Directory.build.props
@@ -6,10 +6,18 @@
        - Feed URI in the nuget.config
        - Native assets build and sha
     -->
+<<<<<<< HEAD
 		<_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
 		<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
 		<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
 		<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
 		<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
+=======
+		<_SkiaSharpVersion>2.88.5</_SkiaSharpVersion>
+		<_HarfBuzzSharpVersion>2.8.2.5</_HarfBuzzSharpVersion>
+		<!-- <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion> -->
+		<SvgSkiaPackageVersion>1.0.0.2</SvgSkiaPackageVersion>
+		<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
+>>>>>>> d7a39a7 (feat: bump packages versions)
 	</PropertyGroup>
 </Project>
\ No newline at end of file

From 0ee7e0c775242374393858ea023052ff40eba7cd Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Thu, 28 Sep 2023 15:47:41 +1000
Subject: [PATCH 2/2] chore: fix merge

---
 src/Resizetizer/Directory.build.props | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Resizetizer/Directory.build.props b/src/Resizetizer/Directory.build.props
index b2bf2804..76d2c45a 100644
--- a/src/Resizetizer/Directory.build.props
+++ b/src/Resizetizer/Directory.build.props
@@ -6,18 +6,10 @@
        - Feed URI in the nuget.config
        - Native assets build and sha
     -->
-<<<<<<< HEAD
-		<_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
-		<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
-		<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
-		<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
-		<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
-=======
 		<_SkiaSharpVersion>2.88.5</_SkiaSharpVersion>
 		<_HarfBuzzSharpVersion>2.8.2.5</_HarfBuzzSharpVersion>
 		<!-- <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion> -->
 		<SvgSkiaPackageVersion>1.0.0.2</SvgSkiaPackageVersion>
 		<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
->>>>>>> d7a39a7 (feat: bump packages versions)
 	</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>