From 38369d71d525c31d8da4b895636fc89e5eed7590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Fri, 6 May 2011 15:46:16 +0200 Subject: [PATCH] Fixed an old bad merge --- report.lyx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/report.lyx b/report.lyx index 19e5270..bdc12ed 100644 --- a/report.lyx +++ b/report.lyx @@ -1406,12 +1406,10 @@ The first prototype of the GGS consisted of simple modules, however, due \begin_layout Standard Once the basic structure of the GGS had been established, the first prototype was removed, remaining was the structure of the modules and the internal - flow of the application.<<<<<<< HEAD This could be seen as an iterative - workflow, with the first prototype being the first iteration. - The second iteration later became the result of the GGS + flow of the application. \end_layout -\begin_layout Subsection +\begin_layout Standard Design This could be seen as an interative workflow, with the first prototype being the first iteration. The second iteration later became the final result of the GGS.