# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1315872434 -7200
# Node ID fca19925366c10189f200220a85e816aca57e68b
# Parent  e4275005761d0630e920a3d372c05488b4323337
rename the button to find conflicts

diff -r e4275005761d -r fca19925366c conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java	Tue Sep 13 01:55:28 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java	Tue Sep 13 02:07:14 2011 +0200
@@ -41,7 +41,7 @@
     {
         JLabel label = new JLabel("Database URL:");
         _databaseUrlTextField = new JTextField(40);
-        _connectButton = new JButton("Connect");
+        _connectButton = new JButton("Find Conflicts");
 
         JPanel databaseUrlPanel = new JPanel();
         databaseUrlPanel.setLayout(new FlowLayout());