# HG changeset patch
# User dirk
# Date 1316331658 -7200
# Node ID aa933f4d48e7665140b7a772f4f5604ff12b1179
# Parent  8d5f791f18118e8e95e25cefd348f769f6cf01e5
change column names

diff -r 8d5f791f1811 -r aa933f4d48e7 conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java	Sun Sep 18 09:37:40 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java	Sun Sep 18 09:40:58 2011 +0200
@@ -10,7 +10,7 @@
 
 public class DifferenceTableModel extends AbstractTableModel
 {
-    public static final String[] COLUMN_NAMES = { "Key", "Current value", "Old value" };
+    public static final String[] COLUMN_NAMES = { "Key", "Current value", "Conflict value" };
 
     private List<Difference> _differences;