fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 zq-erp/pom.xml

@@ -418,7 +418,6 @@
                    <exclude>config/application.properties</exclude>
                    <exclude>config/system.properties</exclude>


                    <exclude>**/*.woff</exclude>
                    <exclude>**/*.woff2</exclude>
                    <exclude>**/*.ttf</exclude>