From c53b6de68c00aea524d94e9e7832f25168c3444c Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sun, 31 Aug 2025 12:14:46 +0800
Subject: [PATCH] Update ScreenshotSelectorWindow.xaml.cs

---
 Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs
index 28dcfa1c..adbbccf9 100644
--- a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs	
+++ b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs	
@@ -807,7 +807,6 @@ namespace Ink_Canvas
             {
                 ReleaseMouseCapture();
             }
-<<<<<<< HEAD
             
             // 释放选择矩形的鼠标捕获
             if (SelectionRectangle.IsMouseCaptured)
@@ -815,9 +814,6 @@ namespace Ink_Canvas
                 SelectionRectangle.ReleaseMouseCapture();
             }
             
-=======
-
->>>>>>> ff086e497c2dc751d72f3a6d72ce5d883b297672
             // 重置选择区域
             _currentSelection = new Rect();
             SelectedArea = null;