From f20d1854870c63c1f6cea8f6b1441fa2aff1ed81 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 17 Aug 2021 11:13:58 +0100
Subject: [PATCH] fix merge issues.

---
 native/Avalonia.Native/src/OSX/window.mm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index a1066155e7..336ec6d339 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -264,7 +264,6 @@ public:
     
     virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
     {
-        START_COM_CALL;
         if(_inResize)
         {
             return S_OK;
@@ -1746,7 +1745,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _isMouseOver = false;
     [self mouseEvent:event withType:LeaveWindow];
     [super mouseExited:event];
-} 
+}
 
 - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
 {