Commit d8cc835c authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

fix .gitmodules

parent 002acb89
......@@ -29,9 +29,5 @@
[submodule "bundled-jre"]
path = bundled-jre
url = https://github.com/DARIAH-DE/bundled-jre
<<<<<<< HEAD
branch = feature/photon
=======
branch = develop
>>>>>>> develop
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