From 44f4b32981bdf81111867e01deae3bf79b5e93c5 Mon Sep 17 00:00:00 2001
From: Erin van der Veen
Date: Thu, 19 Apr 2018 10:39:57 +0200
Subject: Remove <<<<<<HEAD

---
 Assignment1/conversion.tex | 1 -
 1 file changed, 1 deletion(-)
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.
 
-- 
cgit v1.2.3

