oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove bad merge marks

Browse source
This commit is contained in:
Doug Bell 2010-07-15 12:51:45 -05:00
parent bfb22f2541
commit 85e218f62f
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
t/Shop/Pay.t
View file

@ -217,13 +217,3 @@ cmp_bag(
#######################################################################
done_testing();
<<<<<<< HEAD
#----------------------------------------------------------------------------
# Cleanup
END {
defined $newDriver and $newDriver->delete;
defined $newDriver and $anotherDriver->delete;
}
=======
>>>>>>> upstream/WebGUI8