mirror of
https://github.com/adamdruppe/arsd.git
synced 2025-05-02 08:10:06 +03:00
conflict cleanup i think
This commit is contained in:
parent
8e84e162ba
commit
5564bd9d60
1 changed files with 0 additions and 4 deletions
4
mssql.d
4
mssql.d
|
@ -156,10 +156,6 @@ class MsSqlResult : ResultSet {
|
||||||
if(ptr)
|
if(ptr)
|
||||||
goto more;
|
goto more;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
}
|
|
||||||
>>>>>>> 9d02
|
|
||||||
row ~= a;
|
row ~= a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue