Skip to content
Snippets Groups Projects
Commit 5584cb73 authored by Michael Kohlhase's avatar Michael Kohlhase
Browse files

case conflict

parent 65d73872
No related branches found
No related tags found
No related merge requests found
......@@ -47,7 +47,7 @@ PVS/NASA pvs
MitM/Models mmt,stex
MitM/Foundation mmt
MitM/smglom mmt
teaching/KRMT mmt
Teaching/KRMT mmt
#formats
stex latexml,stex-omdoc planetary
mmt mmt-omdoc mh-html,planetary
......@@ -66,7 +66,7 @@ HOLLight HOLLight/basic
PVS PVS/Prelude,PVS/NASA
MitM MitM/Models,MitM/Foundation,MitM/smglom
ODK ODK/ODK,ODK/Sage,ODK/GAP,ODK/lmfdb
teaching teaching/KRMT
Teaching Teaching/KRMT
#mainpage_help
/meta/inf/doc/help/main.html
#external_lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment