conflict cleanup i think

2011-11-29 10:01:21 -05:00 · 2011-11-29 10:01:21 -05:00 · 5564bd9d60
parent 8e84e162ba
commit 5564bd9d60
1 changed files with 0 additions and 4 deletions
--- a/mssql.d
+++ b/mssql.d
@ -156,10 +156,6 @@ class MsSqlResult : ResultSet {
 						if(ptr)
 							goto more;
 					}
-<<<<<<< HEAD
-=======
-				}
->>>>>>> 9d02
 					row ~= a;
 				}