ca1dca59cc
# Conflicts: # .idea/gradle.xml # app/src/main/java/com/example/oplogy/CreateRoot.java # app/src/main/java/com/example/oplogy/MainActivity.java |
||
---|---|---|
.. | ||
.gitignore | ||
compiler.xml | ||
gradle.xml | ||
misc.xml | ||
vcs.xml |
ca1dca59cc
# Conflicts: # .idea/gradle.xml # app/src/main/java/com/example/oplogy/CreateRoot.java # app/src/main/java/com/example/oplogy/MainActivity.java |
||
---|---|---|
.. | ||
.gitignore | ||
compiler.xml | ||
gradle.xml | ||
misc.xml | ||
vcs.xml |