robin/Robin_PHD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge muck about

Browse Source
This commit is contained in:
Robin Clark 2010-11-04 09:13:18 +00:00
parent b451493b94
commit 24bc10c6ce
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lifecycle_modelling/paper.tex
View File

@ -21,15 +21,9 @@
% numbers at outer edges % numbers at outer edges
\pagenumbering{arabic} % Arabic page numbers hereafter \pagenumbering{arabic} % Arabic page numbers hereafter
\author{R.P.Clark} \author{R.P.Clark}
<<<<<<< HEAD
\title{FMMD Lifecycle Modelling}
\maketitle
\input{lifecycle_modelling}
=======
\title{Product Lifecycle Modelling with FMMD} \title{Product Lifecycle Modelling with FMMD}
\maketitle \maketitle
\input{lifecycle_modelling_paper} \input{lifecycle_modelling_paper}
>>>>>>> 53352f41d87e0db41a23770a5da443a9345b982e
\bibliographystyle{plain} \bibliographystyle{plain}
\bibliography{../vmgbibliography,../mybib} \bibliography{../vmgbibliography,../mybib}