From 7c031953a4b48a449d3fcab1bda09605b51271fd Mon Sep 17 00:00:00 2001
From: EduardoCopat <ecopat@gmail.com>
Date: Wed, 23 Nov 2016 15:11:16 +0100
Subject: [PATCH] Merge commit conflicts

---
 src/zabapgit_object_w3xx.prog.abap | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/zabapgit_object_w3xx.prog.abap b/src/zabapgit_object_w3xx.prog.abap
index fb21b6c70..63fd21bce 100644
--- a/src/zabapgit_object_w3xx.prog.abap
+++ b/src/zabapgit_object_w3xx.prog.abap
@@ -346,11 +346,6 @@ CLASS lcl_object_w3super IMPLEMENTATION.
 
   ENDMETHOD.                    "lif_object~delete
 
-<<<<<<< HEAD
-  METHOD lif_object~compare_to_remote_version.
-    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
-  ENDMETHOD.
-=======
   METHOD get_ext.
 
     FIELD-SYMBOLS <param> LIKE LINE OF it_params.
@@ -365,7 +360,10 @@ CLASS lcl_object_w3super IMPLEMENTATION.
     SHIFT rv_ext LEFT DELETING LEADING '.'.
 
   ENDMETHOD.  " get_ext.
->>>>>>> refs/remotes/larshp/master
+  
+  METHOD lif_object~compare_to_remote_version.
+    CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.
+  ENDMETHOD.  
 
 ENDCLASS. "lcl_object_W3SUPER IMPLEMENTATION