Behron
3e39a34a7a
More merge conflicts. Taking main changes then will integrate mine.
4 lines
169 B
XML
4 lines
169 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
|
</project> |