CWS-TOOLING: integrate CWS hr76

1 files changed, 2 insertions, 2 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
index ccc1e7bf11df..ad3460159262 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
@@ -120,8 +120,8 @@ public class SolarisHelper {
         String mailLine = "mail=";
         adminFile.add(mailLine);
 
-        String conflictLine = "conflict=quit";
-        if ( data.isUserInstallation() ) { conflictLine = "conflict=nocheck"; }
+        String conflictLine = "conflict=nochange";
+        if ( data.isUserInstallation() ) { conflictLine = "conflict=nochange"; }
         adminFile.add(conflictLine);
 
         String runlevelLine = "runlevel=nocheck";