Fix merge conflicts

ibennetch · ibennetch · commit 7f2236981257 · 2022-05-11T01:45:43.000-04:00
Signed-off-by: Isaac Bennetch &lt;bennetch@gmail.com&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -3,7 +3,9 @@ phpMyAdmin - ChangeLog
 
 5.3.0 (not yet released)
 
-5.2.0 (not yet released)
+5.2.1 (not yet released)
+
+5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
 - issue #16521 Drop support for Internet Explorer and others
 - issue        Upgrade to shapefile 3
diff --git a/package.json b/package.json
@@ -60,7 +60,12 @@
   },
   "scripts": {
     "postinstall": "yarn run build",
+<<<<<<< HEAD
     "build": "webpack",
+=======
+    "build": "yarn run css-compile --style=compressed && yarn run css-prefix && yarn run css-rtl && yarn run js-compile",
+    "css-compile": "sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css themes/bootstrap/scss:themes/bootstrap/css setup/scss:setup",
+>>>>>>> QA_5_2
     "css-lint": "stylelint -s scss \"themes/**/scss/*.scss\" \"setup/scss/*.scss\"",
     "js-lint": "eslint js/src test/javascript test/jest jest.config.js",
     "test": "jest"
