forked from afp-mirror/Core_DOM
Fixed bad merge.
This commit is contained in:
parent
f102a4f006
commit
0bbda09de8
|
@ -9,15 +9,9 @@ session "Core_SC_DOM" (AFP) = "HOL-Library" +
|
||||||
"common/pointers"
|
"common/pointers"
|
||||||
"common/preliminaries"
|
"common/preliminaries"
|
||||||
"common/tests"
|
"common/tests"
|
||||||
<<<<<<< HEAD
|
|
||||||
"safely_composable"
|
|
||||||
"safely_composable/classes"
|
|
||||||
"safely_composable/pointers"
|
|
||||||
=======
|
|
||||||
"safely_composable"
|
"safely_composable"
|
||||||
"safely_composable/classes"
|
"safely_composable/classes"
|
||||||
"safely_composable/pointers"
|
"safely_composable/pointers"
|
||||||
>>>>>>> 64ac3d3786e34b59b9609fed7a4f1c7c88b6756e
|
|
||||||
theories
|
theories
|
||||||
Core_DOM
|
Core_DOM
|
||||||
Core_DOM_Tests
|
Core_DOM_Tests
|
||||||
|
|
Reference in New Issue