fixed merge conflict with new enum types

BAKKA Editor/Chart.h

@@ -3,10 +3,35 @@
 #include <iterator>
 #include <list>
 
+enum NoteType {
+	TouchNoBonus = 1,
+	TouchBonus = 2,
+	SnapRedNoBonus = 3,
+	SnapBlueNoBonus = 4,
+	SlideOrangeNoBonus = 5,
+	SlideOrangeBonus = 6,
+	SlideGreenNoBonus = 7,
+	SlideGreenBonus = 8,
+	HoldStartNoBonus = 9,
+	HoldMiddle = 10,
+	HoldEnd = 11,
+	MaskAdd = 12,
+	MaskRemove = 13,
+	EndOfChart = 14,
+	Chain = 16,
+	TouchBonusFlair = 20,
+	SnapRedBonusFlair = 21,
+	SnapBlueBonusFlair = 22,
+	SlideOrangeBonusFlair = 23,
+	SlideGreenBonusFlair = 24,
+	HoldStartBonusFlair = 25,
+	ChainBonusFlair = 26,
+};
+
 struct NotesNode {
 	int beat;
 	int subBeat;
-	int noteType;
+	NoteType noteType;
 	int position;
 	int size;
 	int holdChange;
@@ -15,10 +40,22 @@ struct NotesNode {
 	std::list<NotesNode>::iterator prevNode;
 };
 
+enum GimmickType {
+	NoGimmick = 1,
+	BpmChange = 2,
+	TimeSignatureChange = 3,
+	HiSpeedChange = 5,
+	ReverseStart = 6,
+	ReverseMiddle = 7,
+	ReverseEnd = 8,
+	StopStart = 9,
+	StopEnd = 10,
+};
+
 struct PreChartNode {
 	int beat;
 	int subBeat;
-	int type;
+	GimmickType type;
 	double BPM;		//2
 	int beatDiv1;	//3
 	int beatDiv2;	//3

BAKKA Editor/MyForm.resx

@@ -4204,12 +4204,15 @@ Volume:</value>
   <data name="&gt;&gt;showCursorDuringPlaybackToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+<<<<<<< HEAD
   <data name="&gt;&gt;highlightViewedNoteToolStripMenuItem.Name" xml:space="preserve">
     <value>highlightViewedNoteToolStripMenuItem</value>
   </data>
   <data name="&gt;&gt;highlightViewedNoteToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+=======
+>>>>>>> origin/master
   <data name="&gt;&gt;aboutToolStripMenuItem.Name" xml:space="preserve">
     <value>aboutToolStripMenuItem</value>
   </data>