summaryrefslogtreecommitdiffstats
path: root/psalm.xml
diff options
context:
space:
mode:
Diffstat (limited to 'psalm.xml')
-rw-r--r--psalm.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/psalm.xml b/psalm.xml
index 8abd320..5cf23eb 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<<<<<<< HEAD
+=======
+<!--
+SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com>
+SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net>
+
+SPDX-License-Identifier: CC0-1.0
+-->
+>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d
<psalm
errorLevel="4"
resolveFromConfigFile="true"
@@ -7,6 +16,7 @@
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
+<<<<<<< HEAD
<file name="generate-sample-gig-data.php" />
<file name="giglogadmin.php" />
<file name="includes/band.php" />
@@ -33,3 +43,18 @@
</ignoreFiles>
</projectFiles>
</psalm>
+=======
+ <file name="generate-sample-gig-data.php"/>
+ <file name="giglogadmin.php"/>
+ <directory name="includes"/>
+ <ignoreFiles>
+ <directory name="vendor"/>
+ <directory name="includes/public/shortcodes" />
+ </ignoreFiles>
+ </projectFiles>
+
+ <issueHandlers>
+ <InvalidGlobal errorLevel="suppress" />
+ </issueHandlers>
+<plugins><pluginClass class="PsalmWordPress\Plugin"/></plugins></psalm>
+>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d