Révision 760

tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java (revision 760)
101 101
		}
102 102
		if (argsList.contains("-run")) { //$NON-NLS-1$
103 103
			//System.out.println("Running TXM");
104
<<<<<<< .mine
105 104
//		} else if (argsList.contains("-standalone")) { //$NON-NLS-1$
106 105
//			File userhomeDirectory = new File("workspace").getAbsoluteFile(); // eclipse default workspace directory
107 106
//			File defaultWorkspaceFile = new File("workspace/workspaces/default.xml");

Formats disponibles : Unified diff