VIPQ/JavaSE/.idea/encodings.xml

<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<<<<<<< HEAD
  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
=======
  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
    <file url="file://$PROJECT_DIR$/dayapi/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/dayapi/src/main/resources" charset="UTF-8" />
>>>>>>> cb2171b7c92a8e0290df886fe1fc7dd6fbf94100
    <file url="PROJECT" charset="UTF-8" />
  </component>
</project>