Merge branch 'develop' into 'features/Encapsulation'
# Conflicts: # demoproject/.idea/misc.xml
Showing
Hello-World/.idea/.gitignore
0 → 100644
Hello-World/.idea/misc.xml
0 → 100644
Hello-World/.idea/vcs.xml
0 → 100644
Hello-World/Hello-World.iml
0 → 100644
File added
Hello-World/src/Main.java
0 → 100644
demoproject/.idea/.gitignore
0 → 100644
demoproject/.idea/vcs.xml
0 → 100644
demoproject/demoproject.iml
0 → 100644
demoproject/src/Main.java
0 → 100644
singleton/.idea/.gitignore
0 → 100644
singleton/.idea/misc.xml
0 → 100644
singleton/.idea/modules.xml
0 → 100644
singleton/.idea/vcs.xml
0 → 100644
File added
File added
singleton/singleton.iml
0 → 100644