fix merge code error

swoole · Dec 3, 2024 · fc72fa6 · fc72fa6
1 parent 88f34f7
commit fc72fa6
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/sapi/src/builder/enabled_extensions.php b/sapi/src/builder/enabled_extensions.php
@@ -40,13 +40,9 @@
     //'gettext',
     'uuid',
     //'phpy'
-<<<<<<< HEAD
-    'xslwriter',
+    'xlswriter',
     'apcu',
     'ds',
     'ssh2',
     'pgsql'
-=======
-    'xlswriter'
->>>>>>> experiment-feature
 ];