Fix merge conflicts

Peterburnett · Peterburnett · commit 3c3022e2578e · 2024-12-03T08:09:46.000+10:00
diff --git a/amd/src/embed.js b/amd/src/embed.js
@@ -94,4 +94,4 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
         });
     });
 
-});
+});
diff --git a/reporting b/reporting
@@ -1 +1 @@
-Subproject commit 82b8b8187ac456b644f3b328a3b9a91489a3a551
+Subproject commit 0968db5d36b7ed5e19eff63ec06c36d75593044c
diff --git a/version.php b/version.php
@@ -28,6 +28,5 @@
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = '1.26.1';
 $plugin->supported = [400, 404];
 $plugin->release   = '1.27.1';

-Original file line number
+Diff line change
         });
     });
 -});
 +});