Commit 909d398c authored by Michael Kohlhase's avatar Michael Kohlhase

fixing conflict

parent 26bba50c
id: smglom/smglom
source-base: http://mathhub.info/smglom/smglom
narration-base: http://mathhub.info/smglom/smglom
<<<<<<< HEAD
dependencies: smglom/linear-algebra,smglom/trigonometry,smglom/calculus,smglom/numberfields,smglom/sets,smglom/algebra,smglom/primes,smglom/mv,smglom/numbers
=======
dependencies: smglom/linear-algebra,smglom/trigonometry,smglom/calculus,smglom/analysis,smglom/numberfields,smglom/sets,smglom/algebra,smglom/primes,smglom/mv,smglom/numbers
>>>>>>> 60c298f93752209cb509f74e36d8babb76d9edbc
responsible: juergen.schefter@Zentralblatt-MATH.org
title: Staging Ground
teaser: Various mathematical concepts to be sorted into SMGloM repositories
......
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