merge muck about

2010-11-04 09:13:18 +00:00 · 2010-11-04 09:13:18 +00:00 · 24bc10c6ce
commit 24bc10c6ce
parent b451493b94
1 changed files with 0 additions and 6 deletions
--- a/lifecycle_modelling/paper.tex
+++ b/lifecycle_modelling/paper.tex
@ -21,15 +21,9 @@
                                              % numbers at outer edges
 \pagenumbering{arabic}                        % Arabic page numbers hereafter
 \author{R.P.Clark}
-<<<<<<< HEAD
-\title{FMMD Lifecycle Modelling}
-\maketitle 
-\input{lifecycle_modelling}
-=======
 \title{Product Lifecycle Modelling with FMMD}
 \maketitle 
 \input{lifecycle_modelling_paper}
->>>>>>> 53352f41d87e0db41a23770a5da443a9345b982e

 \bibliographystyle{plain}
 \bibliography{../vmgbibliography,../mybib}