diff options
Diffstat (limited to 'sw/prj/d.lst')
| -rw-r--r-- | sw/prj/d.lst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 0cb261c5f0f1..d9c3e89d62ab 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,3 +1,5 @@ +<<<<<<< local +======= mkdir: %COMMON_DEST%\bin%_EXT%\hid mkdir: %_DEST%\inc%_EXT%\sw mkdir: %_DEST%\xml%_EXT%\uiconfig @@ -60,3 +62,4 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* ..\%__SRC%\misc\sw.component %_DEST%\xml%_EXT%\sw.component ..\%__SRC%\misc\vbaswobj.component %_DEST%\xml%_EXT%\vbaswobj.component +>>>>>>> other |