SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Post merge cleanup

Browse Source
This commit is contained in:
Christian Guenter 2017-08-14 17:50:23 +00:00
parent a99bdd2088
commit 8e4a3e109b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zabapgit_object_enho.prog.abap
View File

@ -131,10 +131,6 @@ CLASS lcl_object_enho_wdyc IMPLEMENTATION.
ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION
<<<<<<< HEAD
||||||| merged common ancestors
=======
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
* CLASS lcl_object_enho_wdyconf DEFINITION * CLASS lcl_object_enho_wdyconf DEFINITION
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
@ -263,8 +259,6 @@ CLASS lcl_object_enho_wdyn IMPLEMENTATION.
ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION ENDCLASS. "lcl_object_enho_wdyconf IMPLEMENTATION
>>>>>>> 4826b837037c33ea6360bf08d50202b10ee9a7d0
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
* CLASS lcl_object_enho_clif DEFINITION * CLASS lcl_object_enho_clif DEFINITION
*----------------------------------------------------------------------* *----------------------------------------------------------------------*