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

fixed conflict from previous update

Browse source
This commit is contained in:
daviddelikat 2009-10-04 05:56:46 -05:00
parent d0171f7199
commit e6d95ec533
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/upgrades/upgrade_7.8.0-7.8.1.pl
View file

@ -36,11 +36,8 @@ removeOldSubscriptionTables( $session );
removeOldITransactTables( $session );
removeSQLFormTables( $session );
fixBadRevisionDateColumns( $session );
<<<<<<< HEAD:docs/upgrades/upgrade_7.8.0-7.8.1.pl
addEMSSubmission( $session );
=======
removeImportCruft( $session );
>>>>>>> ad702e908f63d36d79be04054b586044bd3c9ecf:docs/upgrades/upgrade_7.8.0-7.8.1.pl
finish($session); # this line required