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*

---
 .../BoogieLanguageService/Integration/Source.cs    | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'Util/VS2010/Boogie/BoogieLanguageService/Integration/Source.cs')

diff --git a/Util/VS2010/Boogie/BoogieLanguageService/Integration/Source.cs b/Util/VS2010/Boogie/BoogieLanguageService/Integration/Source.cs
index 418bec01..92b5a884 100644
--- a/Util/VS2010/Boogie/BoogieLanguageService/Integration/Source.cs
+++ b/Util/VS2010/Boogie/BoogieLanguageService/Integration/Source.cs
@@ -1,41 +1,41 @@
-/***************************************************************************
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-This code is licensed under the Visual Studio SDK license terms.
-THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-
-***************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.VisualStudio.TextManager.Interop;
-using Microsoft.VisualStudio.Package;
-
-namespace Demo
-{
-    public class Source : Microsoft.VisualStudio.Package.Source
-    {
-        public Source(LanguageService service, IVsTextLines textLines, Colorizer colorizer)
-            : base(service, textLines, colorizer)
-        {
-        }
-
-        private object parseResult;
-        public object ParseResult
-        {
-            get { return parseResult; }
-            set { parseResult = value; }
-        }
-
-        private IList<TextSpan[]> braces;
-        public IList<TextSpan[]> Braces
-        {
-            get { return braces; }
-            set { braces = value; }
-        }
-    }
+/***************************************************************************
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+This code is licensed under the Visual Studio SDK license terms.
+THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+
+***************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.VisualStudio.TextManager.Interop;
+using Microsoft.VisualStudio.Package;
+
+namespace Demo
+{
+    public class Source : Microsoft.VisualStudio.Package.Source
+    {
+        public Source(LanguageService service, IVsTextLines textLines, Colorizer colorizer)
+            : base(service, textLines, colorizer)
+        {
+        }
+
+        private object parseResult;
+        public object ParseResult
+        {
+            get { return parseResult; }
+            set { parseResult = value; }
+        }
+
+        private IList<TextSpan[]> braces;
+        public IList<TextSpan[]> Braces
+        {
+            get { return braces; }
+            set { braces = value; }
+        }
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3