From b6087090141ad2c1d8464e99bf4c65fee2e09b5d Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Wed, 23 Mar 2022 17:52:36 +0100
Subject: [PATCH] resolved: missed conflict

---
 AppKit/CPScrollView.j | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j
index 9b1adf48a..893def9ac 100644
--- a/AppKit/CPScrollView.j
+++ b/AppKit/CPScrollView.j
@@ -1343,8 +1343,6 @@ Notifies the delegate when the scroll view has finished scrolling.
 #pragma mark -
 #pragma mark Overrides
 
-<<<<<<< HEAD
-
 - (void)_removeObservers
 {
     if (!_isObserving)
@@ -1370,10 +1368,6 @@ Notifies the delegate when the scroll view has finished scrolling.
     [super _addObservers];
 }
 
-
-
-=======
->>>>>>> pl_2719
 - (void)drawRect:(CGRect)aRect
 {
     [super drawRect:aRect];