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

Merge commit conflicts

Browse Source
This commit is contained in:
EduardoCopat 2016-11-23 15:11:16 +01:00
parent ede1b57561
commit 7c031953a4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zabapgit_object_w3xx.prog.abap
View File

@ -346,11 +346,6 @@ CLASS lcl_object_w3super IMPLEMENTATION.
ENDMETHOD. "lif_object~delete 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. METHOD get_ext.
FIELD-SYMBOLS <param> LIKE LINE OF it_params. FIELD-SYMBOLS <param> LIKE LINE OF it_params.
@ -365,7 +360,10 @@ CLASS lcl_object_w3super IMPLEMENTATION.
SHIFT rv_ext LEFT DELETING LEADING '.'. SHIFT rv_ext LEFT DELETING LEADING '.'.
ENDMETHOD. " get_ext. 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 ENDCLASS. "lcl_object_W3SUPER IMPLEMENTATION