no message

diff --git a/MooTrackView.java b/MooTrackView.java
index 84d08123a3241bd13fb9691864c271075bf1229f..7ad81ff31df7a3ce31f233992c178c42e352beb5 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -5,7 +5,7 @@ import java.awt.*;
 /**
  * Graphical representation of a MIDI track.
  * 
- * @author  Andersson, Andreen, Lanneskog, Pehrson
+ * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
  
@@ -14,23 +14,10 @@ public class MooTrackView extends JPanel implements ActionListener {
        private MooTrackTitle title;
        private NoteArea notes;
        private Rectangle box;
-<<<<<<< MooTrackView.java
        private JPopupMenu popup;
        private JMenuItem menuItem;
        private String newline = "\n";
        
-=======
-       //private Rectangle box2;
-       //private JPanel notes;
-
-       private static final int PANEL_WIDTH = 65;
-       private static final int TITLE_HEIGHT = 45;
-       private static final int NOTEVIEW_HEIGHT = 200;
-       
-       /** 
-        * Creates 
-        */
->>>>>>> 1.13
        public MooTrackView () {
                setLayout(new BorderLayout());
                this.setBorder(BorderFactory.createLineBorder(Color.black));
@@ -90,7 +77,6 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-<<<<<<< MooTrackView.java
        
        class PopupListener extends MouseAdapter {
         public void mousePressed(MouseEvent e) {
@@ -112,6 +98,4 @@ public class MooTrackView extends JPanel implements ActionListener {
        private static final int PANEL_WIDTH = 65;
        private static final int TITLE_HEIGHT = 40;
        private static final int NOTEVIEW_HEIGHT = 200;
-=======
->>>>>>> 1.13
 }