diff options
Diffstat (limited to 'bin/rununittests.bat')
| -rw-r--r-- | bin/rununittests.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 79fb0f5fd0..952e1d5186 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -1,3 +1,4 @@ +<<<<<<< HEAD:bin/rununittests.bat ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). @@ -83,9 +84,9 @@ tst_qcrmlparser.exe tst_qsystemdeviceinfo.exe tst_qsystemdisplayinfo.exe tst_qsysteminfo.exe -tst_qsystemmemoryinfo.exe tst_qsystemnetworkinfo.exe tst_qsystemscreensaver.exe +tst_qsystemstorageinfo.exe cd %SAVED_PWD% |