Projects >> jbundle >>12b83b90296cf09217453da31a36d172daa6d0e9

Chunk
Conflicting content
			javaCommand = command;
		if ((javaCommand == null) || (javaCommand.length() == 0))
			javaCommand = this.getInitialCommand(false);
<<<<<<< HEAD
		Util.getLogger().info("=target command=" + this.cleanCommand(javaCommand));
		System.out.println("=doJavaBrowserBack command=" + this.cleanCommand(javaCommand));
		BaseApplet.handleAction(this.cleanCommand(command), this, this, Constants.DONT_PUSH_TO_BROSWER);
		//x		this.doAction(this.cleanCommand(javaCommand), Constants.DONT_PUSH_TO_BROSWER);
=======
		Util.getLogger().info("doJavaBrowserBack " + this.cleanCommand(javaCommand));
		BaseApplet.handleAction(this.cleanCommand(javaCommand), this, this, Constants.DONT_PUSH_TO_BROSWER);
>>>>>>> b986c8095f79e6bf89a15b65233ee0dbd1c2a5f2
	}
	/**
	 * Get the original screen params.
Solution content
			javaCommand = command;
		if ((javaCommand == null) || (javaCommand.length() == 0))
			javaCommand = this.getInitialCommand(false);
		Util.getLogger().info("doJavaBrowserBack " + this.cleanCommand(javaCommand));
		System.out.println("=doJavaBrowserBack command=" + this.cleanCommand(javaCommand));
		BaseApplet.handleAction(this.cleanCommand(command), this, this, Constants.DONT_PUSH_TO_BROSWER);
	}
	/**
	 * Get the original screen params.
File
BaseApplet.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation