1.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/Cust2ServerPanel.java	Mon Jun 26 10:30:18 2000 +0000
     1.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/Cust2ServerPanel.java	Mon Jun 26 10:55:49 2000 +0000
     1.3 @@ -179,13 +179,10 @@
     1.4          gridBagConstraints1 = new java.awt.GridBagConstraints();
     1.5          gridBagConstraints1.gridx = 0;
     1.6          gridBagConstraints1.gridy = 4;
     1.7 -<<<<<<< Cust2ServerPanel.java
     1.8          gridBagConstraints1.insets = new java.awt.Insets(11, 18, 0, 8);
     1.9          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.10 -=======
    1.11          gridBagConstraints1.insets = new java.awt.Insets(11, 12, 0, 8);
    1.12          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.13 ->>>>>>> 1.5
    1.14          add(lbServer, gridBagConstraints1);
    1.15          
    1.16          
    1.17 @@ -194,13 +191,10 @@
    1.18          gridBagConstraints1 = new java.awt.GridBagConstraints();
    1.19          gridBagConstraints1.gridx = 0;
    1.20          gridBagConstraints1.gridy = 5;
    1.21 -<<<<<<< Cust2ServerPanel.java
    1.22          gridBagConstraints1.insets = new java.awt.Insets(5, 18, 0, 8);
    1.23          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.24 -=======
    1.25          gridBagConstraints1.insets = new java.awt.Insets(5, 12, 0, 8);
    1.26          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.27 ->>>>>>> 1.5
    1.28          add(lbUser, gridBagConstraints1);
    1.29          
    1.30          
    1.31 @@ -209,13 +203,10 @@
    1.32          gridBagConstraints1 = new java.awt.GridBagConstraints();
    1.33          gridBagConstraints1.gridx = 0;
    1.34          gridBagConstraints1.gridy = 6;
    1.35 -<<<<<<< Cust2ServerPanel.java
    1.36          gridBagConstraints1.insets = new java.awt.Insets(5, 18, 11, 8);
    1.37          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.38 -=======
    1.39          gridBagConstraints1.insets = new java.awt.Insets(5, 12, 11, 8);
    1.40          gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
    1.41 ->>>>>>> 1.5
    1.42          add(lbRepository, gridBagConstraints1);
    1.43          
    1.44      }//GEN-END:initComponents
    1.45 @@ -455,4 +446,4 @@
    1.46       private static void D(String debug) {
    1.47  //        System.out.println("Cust2ServPanel(): "+debug);
    1.48      }
    1.49 -}
    1.50 \ No newline at end of file
    1.51 +}

     2.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/Cust4MountPanel.java	Mon Jun 26 10:30:18 2000 +0000
     2.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/Cust4MountPanel.java	Mon Jun 26 10:55:49 2000 +0000
     2.3 @@ -21,7 +21,7 @@
     2.4   * @author  mkleint
     2.5   * @version 
     2.6   */
     2.7 -public class Cust4MountPanelnew extends javax.swing.JPanel implements CvsCustomPanel, WizardDescriptor.Panel, TreeSelectionListener {
     2.8 +public class Cust4MountPanel extends javax.swing.JPanel implements CvsCustomPanel, WizardDescriptor.Panel, TreeSelectionListener {
     2.9      
    2.10      private NewCvsCustomizer customizer;
    2.11      private CvsFileSystem fs;
    2.12 @@ -29,7 +29,7 @@
    2.13      private boolean isLastPanel = false;
    2.14      
    2.15      private boolean isValid;
    2.16 -    public Cust4MountPanelnew() {
    2.17 +    public Cust4MountPanel() {
    2.18          initComponents ();
    2.19          isValid = false;
    2.20          trRelMount.addTreeSelectionListener(this);
    2.21 @@ -107,7 +107,6 @@
    2.22          add(jPanel1, gridBagConstraints1);
    2.23          
    2.24          
    2.25 -        lbWaiting.setText("jLabel1");
    2.26          
    2.27          gridBagConstraints1 = new java.awt.GridBagConstraints();
    2.28          gridBagConstraints1.gridx = 0;