Fixed an old bad merge

This commit is contained in:
Jonatan Pålsson 2011-05-06 15:46:16 +02:00
parent aad3e2118c
commit 476b56e004

View file

@ -1401,18 +1401,10 @@ textbf{Module}}{A part of a larger system}
The first prototype of the GGS consisted of simple modules, however, due The first prototype of the GGS consisted of simple modules, however, due
to the separation of concerns among the modules, they were easily independently to the separation of concerns among the modules, they were easily independently
modified and improved. 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 was removed, remaining was the structure of the modules and the internal
flow of the application.<<<<<<< HEAD This could be seen as an iterative flow of the application.
workflow, with the first prototype being the first iteration. This could be seen as an interative workflow, with the first prototype
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
being the first iteration. being the first iteration.
The second iteration later became the final result of the GGS. The second iteration later became the final result of the GGS.
\end_layout \end_layout