From 476b56e0044f0c90d70b47e513312d264166b479 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 | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/report.lyx b/report.lyx index 19e5270..e7338b2 100644 --- a/report.lyx +++ b/report.lyx @@ -1401,18 +1401,10 @@ textbf{Module}}{A part of a larger system} The first prototype of the GGS consisted of simple modules, however, due to the separation of concerns among the modules, they were easily independently modified and improved. -\end_layout - -\begin_layout Standard -Once the basic structure of the GGS had been established, the first prototype + 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 -\end_layout - -\begin_layout Subsection -Design This could be seen as an interative workflow, with the first prototype + flow of the application. + 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. \end_layout