From 8e4a3e109b93c1b081345c40c6d00cf3b26c04bd Mon Sep 17 00:00:00 2001 From: Christian Guenter Date: Mon, 14 Aug 2017 17:50:23 +0000 Subject: [PATCH] Post merge cleanup --- src/zabapgit_object_enho.prog.abap | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/zabapgit_object_enho.prog.abap b/src/zabapgit_object_enho.prog.abap index 9e86c660a..03330fda4 100644 --- a/src/zabapgit_object_enho.prog.abap +++ b/src/zabapgit_object_enho.prog.abap @@ -131,10 +131,6 @@ CLASS lcl_object_enho_wdyc IMPLEMENTATION. ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION -<<<<<<< HEAD -||||||| merged common ancestors - -======= *----------------------------------------------------------------------* * CLASS lcl_object_enho_wdyconf DEFINITION *----------------------------------------------------------------------* @@ -263,8 +259,6 @@ CLASS lcl_object_enho_wdyn IMPLEMENTATION. ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION - ->>>>>>> 4826b837037c33ea6360bf08d50202b10ee9a7d0 *----------------------------------------------------------------------* * CLASS lcl_object_enho_clif DEFINITION *----------------------------------------------------------------------*