Projects >> titanium_studio_sdk >>ad6dfd1c974bc2ad72bc95eb31811336be590569

Chunk
Conflicting content 
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;

<<<<<<< HEAD
import com.appcelerator.titanium.core.ITiAppModel;
import com.appcelerator.titanium.core.TiElementDefinition;
=======
>>>>>>> 40982f21767a6d3c5eef2165a5c7663ccd7e407a
import com.appcelerator.titanium.core.TitaniumConstants;
import com.appcelerator.titanium.core.TitaniumProjectBuilder;
import com.appcelerator.titanium.core.tiapp.ITiAppModel;
Solution content 
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;

import com.appcelerator.titanium.core.TitaniumConstants;
import com.appcelerator.titanium.core.TitaniumProjectBuilder;
import com.appcelerator.titanium.core.tiapp.ITiAppModel;
File
NewDesktopProjectWizard.java
Developer's decision
Version 2
Kind of conflict
Import