summaryrefslogtreecommitdiff
path: root/Assignment1/conversion.tex
diff options
context:
space:
mode:
authorErin van der Veen2018-04-19 10:39:57 +0200
committerErin van der Veen2018-04-19 10:39:57 +0200
commit44f4b32981bdf81111867e01deae3bf79b5e93c5 (patch)
treeeaad256f855cb51ef67b2a2fcba5920209fdc5df /Assignment1/conversion.tex
parentMerge branch 'master' of gitlab.science.ru.nl:eveen/Model-Checking (diff)
Remove <<<<<<HEAD
Diffstat (limited to 'Assignment1/conversion.tex')
-rw-r--r--Assignment1/conversion.tex1
1 files changed, 0 insertions, 1 deletions
diff --git a/Assignment1/conversion.tex b/Assignment1/conversion.tex
index 1221952..382ec8b 100644
--- a/Assignment1/conversion.tex
+++ b/Assignment1/conversion.tex
@@ -374,7 +374,6 @@ Let us first define the Muller Automaton:
Converting a NBA to a Muller automaton was shown to be possible by R. McNaughton~\cite{McNaughton1966}
and is part of what is known as McNaughton's theorem.
-<<<<<<< HEAD
There are multiple ways to convert a NBA to a Muller Automaton.
In this book we will describe Safra's Determinization Algorithm.