From d652155ae013f36a1ee17653a8e458baad2d9c2c Mon Sep 17 00:00:00 2001
From: Checkmate50 <dgeisler50@gmail.com>
Date: Mon, 6 Jun 2016 23:14:18 -0600
Subject: Merging complete.  Everything looks good *crosses fingers*

---
 Source/ModelViewer/SourceView.Designer.cs | 124 +++++++++++++++---------------
 1 file changed, 62 insertions(+), 62 deletions(-)

(limited to 'Source/ModelViewer/SourceView.Designer.cs')

diff --git a/Source/ModelViewer/SourceView.Designer.cs b/Source/ModelViewer/SourceView.Designer.cs
index 55ca2e37..30bc5408 100644
--- a/Source/ModelViewer/SourceView.Designer.cs
+++ b/Source/ModelViewer/SourceView.Designer.cs
@@ -1,63 +1,63 @@
-namespace Microsoft.Boogie.ModelViewer
-{
-  partial class SourceView
-  {
-    /// <summary>
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary>
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing)
-    {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Windows Form Designer generated code
-
-    /// <summary>
-    /// Required method for Designer support - do not modify
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent()
-    {
-      this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-      this.SuspendLayout();
-      // 
-      // richTextBox1
-      // 
-      this.richTextBox1.DetectUrls = false;
-      this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.richTextBox1.Font = new System.Drawing.Font("Lucida Sans Typewriter", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.richTextBox1.HideSelection = false;
-      this.richTextBox1.Location = new System.Drawing.Point(0, 0);
-      this.richTextBox1.Name = "richTextBox1";
-      this.richTextBox1.ReadOnly = true;
-      this.richTextBox1.Size = new System.Drawing.Size(715, 582);
-      this.richTextBox1.TabIndex = 0;
-      this.richTextBox1.Text = "#include <vcc.h>\n\nint main()\n{\n\\foo\n}";
-      this.richTextBox1.WordWrap = false;
-      // 
-      // SourceView
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(715, 582);
-      this.Controls.Add(this.richTextBox1);
-      this.Name = "SourceView";
-      this.Text = "SourceView";
-      this.ResumeLayout(false);
-
-    }
-
-    #endregion
-
-    private System.Windows.Forms.RichTextBox richTextBox1;
-  }
+namespace Microsoft.Boogie.ModelViewer
+{
+  partial class SourceView
+  {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing)
+    {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent()
+    {
+      this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+      this.SuspendLayout();
+      // 
+      // richTextBox1
+      // 
+      this.richTextBox1.DetectUrls = false;
+      this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.richTextBox1.Font = new System.Drawing.Font("Lucida Sans Typewriter", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.richTextBox1.HideSelection = false;
+      this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+      this.richTextBox1.Name = "richTextBox1";
+      this.richTextBox1.ReadOnly = true;
+      this.richTextBox1.Size = new System.Drawing.Size(715, 582);
+      this.richTextBox1.TabIndex = 0;
+      this.richTextBox1.Text = "#include <vcc.h>\n\nint main()\n{\n\\foo\n}";
+      this.richTextBox1.WordWrap = false;
+      // 
+      // SourceView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.ClientSize = new System.Drawing.Size(715, 582);
+      this.Controls.Add(this.richTextBox1);
+      this.Name = "SourceView";
+      this.Text = "SourceView";
+      this.ResumeLayout(false);
+
+    }
+
+    #endregion
+
+    private System.Windows.Forms.RichTextBox richTextBox1;
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3