jeena/GGS-report
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed an old bad merge

Browse source
This commit is contained in:
Jonatan Pålsson 2011-05-06 15:46:16 +02:00
parent aad3e2118c
commit 38369d71d5
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
report.lyx
View file

@ -1406,12 +1406,10 @@ The first prototype of the GGS consisted of simple modules, however, due
\begin_layout Standard \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.
The second iteration later became the result of the GGS
\end_layout \end_layout
\begin_layout Subsection \begin_layout Standard
Design This could be seen as an interative workflow, with the first prototype 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.