Skip to content

Commit 3c3022e

Browse files
committed
Fix merge conflicts
1 parent 240e7f1 commit 3c3022e

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

amd/src/embed.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
9494
});
9595
});
9696

97-
});
97+
});

version.php

-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@
2828
$plugin->cron = 0;
2929
$plugin->component = 'mod_hvp';
3030
$plugin->maturity = MATURITY_STABLE;
31-
$plugin->release = '1.26.1';
3231
$plugin->supported = [400, 404];
3332
$plugin->release = '1.27.1';

0 commit comments

Comments
 (0)