Skip to content

M
misuperproyecto
Commit db261d6b by Nahuel Mereles Rodriguez
Options

Merge branch 'master' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp

parents dc7ee200 55fe6d52
Showing with 2 additions and 2 deletions
.gitignore
...@@ -4,6 +4,8 @@ target/ ...@@ -4,6 +4,8 @@ target/
!**/src/test/**/target/ !**/src/test/**/target/
### IntelliJ IDEA ### ### IntelliJ IDEA ###
.idea/encodings.xml
.idea/**
.idea/modules.xml .idea/modules.xml
.idea/jarRepositories.xml .idea/jarRepositories.xml
.idea/compiler.xml .idea/compiler.xml
......
.idea/encodings.xml
...@@ -2,6 +2,5 @@ ...@@ -2,6 +2,5 @@
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment