Fix merge conflicts

catalyst · Dec 2, 2024 · 3c3022e · 3c3022e
1 parent 240e7f1
commit 3c3022e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
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
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
@@ Expand Up @@
             });
         });
-    });
+    });