ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

merge error

Browse Source
This commit is contained in:
Fred Tempez 2023-03-28 13:21:16 +02:00
parent 8194ef7c67
commit c13f01899b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core.php
View File

@ -1306,9 +1306,4 @@ class common
}
$zip->close();
}
<<<<<<<<< Temporary merge branch 1
}
=========
}
>>>>>>>>> Temporary merge branch 2
}