mirrors/arsd
1
0
Fork 0
mirror of https://github.com/adamdruppe/arsd.git synced 2025-04-27 05:40:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

conflict cleanup i think

Browse source
This commit is contained in:
Adam D. Ruppe 2011-11-29 10:01:21 -05:00
parent 8e84e162ba
commit 5564bd9d60
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mssql.d
View file

@ -156,10 +156,6 @@ class MsSqlResult : ResultSet {
if(ptr)
goto more;
}
<<<<<<< HEAD
=======
}
>>>>>>> 9d02
row ~= a;
}