Projects >> cdt >>3198d038d44d61189cc54c95bf1e4f451b317e37

Chunk
Conflicting content
/*******************************************************************************
<<<<<<< HEAD
 *  Copyright (c) 2003, 2013 IBM Corporation and others.
 *  All rights reserved. This program and the accompanying materials
 *  are made available under the terms of the Eclipse Public License v1.0
 *  which accompanies this distribution, and is available at
 *  http://www.eclipse.org/legal/epl-v10.html
=======
 * Copyright (c) 2003, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
>>>>>>> 54ae5864d7f9cce25e977c2e10d21123fd7fe9d0
 *
 * Contributors:
 *     QNX Software Systems - Initial implementation
Solution content
/*******************************************************************************
 * Copyright (c) 2003, 2013 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     QNX Software Systems - Initial implementation
File
CUIPreferenceInitializer.java
Developer's decision
Version 1
Kind of conflict
Comment