Rename certificate issue events (#675)

Author: mdjnelson

classes/event/certificate_deleted.php

@@ -124,8 +124,6 @@
 $string['eventtemplatecreated'] = 'Custom certificate template created';
 $string['eventtemplatedeleted'] = 'Custom certificate template deleted';
 $string['eventtemplateupdated'] = 'Custom certificate template updated';
-$string['eventcertificateupdated'] = 'Certificate updated';
-$string['eventcertificatedeleted'] = 'Certificate deleted';
 $string['exampledatawarning'] = 'Some of these values may just be an example to ensure positioning of the elements is possible.';
 $string['font'] = 'Font';
 $string['font_help'] = 'The font used when generating this element.';

classes/event/certificate_issued.php

@@ -89,6 +89,7 @@ function customcert_delete_instance($id) {
 
     $context = context_module::instance($cm->id);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     // Trigger issue_deleted events for each issue.
     $issues = $DB->get_records('customcert_issues', ['customcertid' => $id]);
@@ -100,6 +101,12 @@ function customcert_delete_instance($id) {
     foreach ($issues as $issue) {
         $event = \mod_customcert\event\certificate_deleted::create([
 >>>>>>> e9c072e (Add events for adding and deleting certificates (#675))
+=======
+    // Trigger issue_deleted events for each issue.
+    $issues = $DB->get_records('customcert_issues', ['customcertid' => $id]);
+    foreach ($issues as $issue) {
+        $event = \mod_customcert\event\issue_deleted::create([
+>>>>>>> 7a91b46 (Rename certificate issue events (#675))
             'objectid' => $issue->id,
             'context' => $context,
             'relateduserid' => $issue->userid,