diff options
Diffstat (limited to 'linguistic/prj/d.lst')
-rw-r--r-- | linguistic/prj/d.lst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 4b2e240ef2ef..03237f925764 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -7,9 +7,7 @@ ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml mkdir: %_DEST%\inc%_EXT%\linguistic -<<<<<<< local ..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx -======= -..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx + ..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component ->>>>>>> other + |