fixing merge conflicts from Documentation branch

This commit is contained in:
Roland Hollós 2019-01-29 17:10:44 +01:00 committed by GitHub
parent 85471775ef
commit dc3a72141d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,11 +4,7 @@
* The RBBGCMuso Package
#+AUTHOR: Roland HOLLÓS, Dóra HIDY, Zoltán BARCZA
<<<<<<< HEAD
*Current version: 0.6.1.3*
=======
*Current version: 0.6.1*
>>>>>>> Documentation
RBBGCMuso is an R package which supports the easy but powerful application of the [[http://agromo.agrar.mta.hu/bbgc/][Biome-BGCMuSo]] biogeochemical model in R environment. It also provides some additional tools for the model such as Biome-BGCMuSo optimized Monte-Carlo simulation and global sensitivity analysis. If you would like to use the framework, please read the following description.