finally adding the features closes #8 closes #9

src/Gifitti/Gifitti/Form1.Designer.cs

@@ -34,7 +34,7 @@
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.gifView = new System.Windows.Forms.PictureBox();
-<<<<<<< HEAD
+
             this.mainMenu1 = new System.Windows.Forms.MainMenu(this.components);
             this.menuItem1 = new System.Windows.Forms.MenuItem();
             this.menuItem2 = new System.Windows.Forms.MenuItem();
@@ -42,7 +42,7 @@
             this.PNG = new System.Windows.Forms.MenuItem();
             this.BMP = new System.Windows.Forms.MenuItem();
             this.TIFF = new System.Windows.Forms.MenuItem();
-=======
+
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.button3 = new System.Windows.Forms.Button();
@@ -50,7 +50,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
->>>>>>> playback
+
             ((System.ComponentModel.ISupportInitialize)(this.gifView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -91,7 +91,7 @@
             this.gifView.TabIndex = 2;
             this.gifView.TabStop = false;
             // 
-<<<<<<< HEAD
+
             // mainMenu1
             // 
             this.mainMenu1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
@@ -137,7 +137,7 @@
             this.TIFF.Index = 3;
             this.TIFF.Text = "TIFF";
             this.TIFF.Click += new System.EventHandler(this.menuItem6_Click);
-=======
+
             // textBox1
             // 
             this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
@@ -204,15 +204,15 @@
             // 
             this.timer1.Interval = 20;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
->>>>>>> playback
+
             // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-<<<<<<< HEAD
+
             this.ClientSize = new System.Drawing.Size(436, 449);
-=======
+
             this.ClientSize = new System.Drawing.Size(582, 553);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
@@ -220,7 +220,7 @@
             this.Controls.Add(this.button3);
             this.Controls.Add(this.textBox2);
             this.Controls.Add(this.textBox1);
->>>>>>> playback
+
             this.Controls.Add(this.gifView);
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
@@ -243,7 +243,7 @@
         private System.Windows.Forms.OpenFileDialog openFileDialog1;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
         private System.Windows.Forms.PictureBox gifView;
-<<<<<<< HEAD
+
         private System.Windows.Forms.MainMenu mainMenu1;
         private System.Windows.Forms.MenuItem menuItem1;
         private System.Windows.Forms.MenuItem menuItem2;
@@ -251,7 +251,7 @@
         private System.Windows.Forms.MenuItem PNG;
         private System.Windows.Forms.MenuItem BMP;
         private System.Windows.Forms.MenuItem TIFF;
-=======
+
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.TextBox textBox2;
         private System.Windows.Forms.Button button3;
@@ -259,7 +259,6 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Timer timer1;
->>>>>>> playback
     }
 }
 

src/Gifitti/Gifitti/Form1.cs

@@ -100,7 +100,6 @@ namespace Gifitti
             }
         }
 
-<<<<<<< HEAD
         private Boolean chkImage()
         {
             Boolean check = true;
@@ -223,7 +222,7 @@ namespace Gifitti
                     }
                 }
             }
-=======
+        }
         private void button3_Click(object sender, EventArgs e)
         {
             if (timer1.Enabled == true)
@@ -254,7 +253,6 @@ namespace Gifitti
         private void textBox2_TextChanged(object sender, EventArgs e)
         {
             gm.endFrame = int.Parse(textBox2.Text);
->>>>>>> playback
         }
     }
 }

src/Gifitti/Gifitti/Form1.resx

@@ -123,12 +123,10 @@
   <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>184, 17</value>
   </metadata>
-<<<<<<< HEAD
   <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>353, 17</value>
-=======
+  </metadata>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>388, 17</value>
->>>>>>> playback
   </metadata>
 </root>
\ No newline at end of file