System: v25.0.00 release

GibbonEdu · Jan 20, 2023 · a563d78 · a563d78
1 parent 9882062
commit a563d78
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/gibbon.sql b/gibbon.sql
@@ -5106,13 +5106,8 @@ CREATE TABLE `gibbonSchoolYear` (
 --
 
 INSERT INTO `gibbonSchoolYear` (`gibbonSchoolYearID`, `name`, `status`, `sequenceNumber`, `firstDay`, `lastDay`) VALUES
-<<<<<<< HEAD
-(025,'2022-2023','Current',3,'2022-06-13','2023-06-29'),
-(026,'2023-2024','Upcoming',4,'2023-08-14','2024-06-29');
-=======
 (025, '2022-2023', 'Current', 3, '2022-06-13', '2023-06-29'),
 (026, '2023-2024', 'Upcoming', 4, '2023-08-14', '2024-06-29');
->>>>>>> v25.0.00
 
 -- --------------------------------------------------------
 
@@ -5158,21 +5153,12 @@ CREATE TABLE `gibbonSchoolYearTerm` (
 --
 
 INSERT INTO `gibbonSchoolYearTerm` (`gibbonSchoolYearTermID`, `gibbonSchoolYearID`, `sequenceNumber`, `name`, `nameShort`, `firstDay`, `lastDay`) VALUES
-<<<<<<< HEAD
-(00034,025,31,'Term 1','T1','2022-06-13','2022-12-18'),
-(00035,025,32,'Term 2','T2','2023-01-09','2023-04-02'),
-(00036,025,33,'Term 3','T3','2023-04-17','2023-06-29'),
-(00037,026,34,'Term 1','T1','2023-08-14','2023-12-17'),
-(00038,026,35,'Term 2','T2','2024-01-08','2024-03-25'),
-(00039,026,36,'Term 3','T3','2024-04-16','2024-06-29');
-=======
 (00034, 025, 31, 'Term 1', 'T1', '2022-06-13', '2022-12-18'),
 (00035, 025, 32, 'Term 2', 'T2', '2023-01-09', '2023-04-02'),
 (00036, 025, 33, 'Term 3', 'T3', '2023-04-17', '2023-06-29'),
 (00037, 026, 34, 'Term 1', 'T1', '2023-08-14', '2023-12-17'),
 (00038, 026, 35, 'Term 2', 'T2', '2024-01-08', '2024-03-25'),
 (00039, 026, 36, 'Term 3', 'T3', '2024-04-16', '2024-06-29');
->>>>>>> v25.0.00
 
 -- --------------------------------------------------------