From 71428d8a32d51e2849d6f5db73840d71e6bfb3d9 Mon Sep 17 00:00:00 2001
From: Tim Schilling <tim@aspiredu.com>
Date: Mon, 11 Mar 2024 13:11:08 -0500
Subject: [PATCH] Version 5.2.1

- Adds web service for fetching the site administrators.
---
 version.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/version.php b/version.php
index 27c498b..bd9af24 100755
--- a/version.php
+++ b/version.php
@@ -27,8 +27,14 @@
 
 defined('MOODLE_INTERNAL') || die;
 
+<<<<<<< HEAD
 $plugin->version = 2024030600;
+||||||| parent of 535dc65 (Version 5.2.1)
+$plugin->version = 2024030400;
+=======
+$plugin->version = 2024031100;
+>>>>>>> 535dc65 (Version 5.2.1)
 $plugin->requires = 2022041900.00;
 $plugin->component = 'local_aspiredu';
-$plugin->release = '5.2.0';
+$plugin->release = '5.2.1';
 $plugin->maturity = MATURITY_STABLE;