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

fix merge

Browse source
This commit is contained in:
Doug Bell 2010-07-13 13:17:40 -05:00
parent ef319ea2a2
commit f78386da15
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.9.8-7.9.9.pl
View file

@ -32,13 +32,10 @@ my $quiet; # this line required
my $session = start(); # this line required my $session = start(); # this line required
# upgrade functions go here # upgrade functions go here
<<<<<<< HEAD
addIndexToUserSessionLog($session); addIndexToUserSessionLog($session);
addHeightToCarousel($session); addHeightToCarousel($session);
synchronizeUserProfileTables($session); synchronizeUserProfileTables($session);
=======
migrateAttachmentsToJson( $session ); migrateAttachmentsToJson( $session );
>>>>>>> migrate to JsonTable to edit template attachments
finish($session); # this line required finish($session); # this line required