From 5564bd9d60cd06613f648851a1b517b49d4e1f31 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Tue, 29 Nov 2011 10:01:21 -0500
Subject: [PATCH] conflict cleanup i think

---
 mssql.d | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mssql.d b/mssql.d
index 7b882ed..e2baec4 100644
--- a/mssql.d
+++ b/mssql.d
@@ -156,10 +156,6 @@ class MsSqlResult : ResultSet {
 						if(ptr)
 							goto more;
 					}
-<<<<<<< HEAD
-=======
-				}
->>>>>>> 9d02
 					row ~= a;
 				}