<<<<<<< HEAD
.idea/compiler.xml

.idea/misc.xml

.idea/modules.xml

.idea/vcs.xml

.idea/workspace.xml

os-common-bom/os-common-bom.iml

os-common-core/os-common-core.iml

os-common-security/os-common-security.iml

os-common.iml
=======
.idea/

*.iml

*.class

os-common-bom/target/maven-archiver/

os-common-bom/target/

os-common-core/target/maven-archiver/

os-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/

os-common-core/target/

os-common-security/target/maven-archiver/

os-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/

os-common-security/target/

logging.path_IS_UNDEFINED/history/

logging.path_IS_UNDEFINED/

loggingFile_IS_UNDEFINED

loggingPath_IS_UNDEFINED/
>>>>>>> develop