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

Synchronized with original version

Browse Source
This commit is contained in:
Thomas Erdösi 2017-10-02 12:00:09 +02:00
parent 63a6e57930
commit 0abd3f1372
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/zabapgit_objects.prog.abap
View File

@ -1157,10 +1157,8 @@ CLASS lcl_objects_program IMPLEMENTATION.
zcx_abapgit_exception=>raise( 'error from INSERT REPORT' ). zcx_abapgit_exception=>raise( 'error from INSERT REPORT' ).
ENDIF. ENDIF.
ENDIF. ENDIF.
<<<<<<< HEAD
ENDIF. ENDIF.
=======
IF NOT it_tpool[] IS INITIAL. IF NOT it_tpool[] IS INITIAL.
INSERT TEXTPOOL is_progdir-name INSERT TEXTPOOL is_progdir-name
FROM it_tpool FROM it_tpool
@ -1170,17 +1168,6 @@ CLASS lcl_objects_program IMPLEMENTATION.
zcx_abapgit_exception=>raise( 'error from INSERT TEXTPOOL' ). zcx_abapgit_exception=>raise( 'error from INSERT TEXTPOOL' ).
ENDIF. ENDIF.
ENDIF. ENDIF.
>>>>>>> pr/3
IF NOT it_tpool[] IS INITIAL.
INSERT TEXTPOOL is_progdir-name
FROM it_tpool
LANGUAGE mv_language
STATE 'I'.
IF sy-subrc <> 0.
lcx_exception=>raise( 'error from INSERT TEXTPOOL' ).
ENDIF.
ENDIF.
CALL FUNCTION 'READ_PROGDIR' CALL FUNCTION 'READ_PROGDIR'
EXPORTING EXPORTING