Merging complete. Everything looks good *crosses fingers*

1 files changed, 12 insertions, 12 deletions

diff --git a/Util/VS2010/Boogie/BoogieLanguageService/Integration/IASTResolver.cs b/Util/VS2010/Boogie/BoogieLanguageService/Integration/IASTResolver.cs
index 8de1a454..f3ff41f4 100644
--- a/Util/VS2010/Boogie/BoogieLanguageService/Integration/IASTResolver.cs
+++ b/Util/VS2010/Boogie/BoogieLanguageService/Integration/IASTResolver.cs
@@ -1,13 +1,13 @@
-using System;

-using System.Collections.Generic;

-

-namespace Demo

-{

-    interface IASTResolver

-    {

-        IList<Declaration> FindCompletions(object result, int line, int col);

-        IList<Declaration> FindMembers(object result, int line, int col);

-        string FindQuickInfo(object result, int line, int col);

-        IList<Method> FindMethods(object result, int line, int col, string name);

-    }

+using System;
+using System.Collections.Generic;
+
+namespace Demo
+{
+    interface IASTResolver
+    {
+        IList<Declaration> FindCompletions(object result, int line, int col);
+        IList<Declaration> FindMembers(object result, int line, int col);
+        string FindQuickInfo(object result, int line, int col);
+        IList<Method> FindMethods(object result, int line, int col, string name);
+    }
 }
\ No newline at end of file