Skip to main content
summaryrefslogtreecommitdiffstats
blob: 826c02f4ddc5cd2ee6bac92555f3531db47c5f9d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
################################################################################
# Copyright (c) 2013 Obeo.
# 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:
#     Obeo - initial API and implementation
################################################################################
## ! note ! double the apostrophes if you need one in the printed String
conflict=Conflict
pseudoconflict=Pseudo Conflict

Back to the top