fix merge composer.json

koolreport · Sep 5, 2024 · 4096b82 · 4096b82
1 parent 7267b54
commit 4096b82
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,10 +1,6 @@
 {
     "name": "koolreport/core",
-<<<<<<< HEAD
-    "version":"6.5.0",
-=======
     "version":"6.6.0",
->>>>>>> no_eval_csp
     "description": "An Open Source PHP Reporting Framework for easier and faster report delivery.",
     "keywords": ["php reporting framework","php reporting tools","data processing","data visualization","charts and graphs"],
     "homepage": "https://www.koolreport.com",