diff --git a/README.md b/README.md index 990ebf1f..751aff48 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,16 @@ your changes to the official codebase. $ git clone --recursive https://@git.rhrk.uni-kl.de//dram.vp.system.git ``` +After a pull request being accepted and merged into the official repository +you should get your fork updated. + +``` bash +$ git fetch upstream +$ git checkout master +$ git merge upstream/master +$ git push origin HEAD +``` + After cloning go to the project directory. ``` bash diff --git a/dram/src/simulation/SimulationManager.cpp b/dram/src/simulation/SimulationManager.cpp index f463f23a..396619ad 100644 --- a/dram/src/simulation/SimulationManager.cpp +++ b/dram/src/simulation/SimulationManager.cpp @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2015, University of Kaiserslautern * All rights reserved. * diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp index 04f08f0b..0c160654 100644 --- a/dram/src/simulation/main.cpp +++ b/dram/src/simulation/main.cpp @@ -36,13 +36,11 @@ #include #include -#include "SimulationManager.h" -#include "../controller/core/configuration/Configuration.h" - #include #include #include +#include "SimulationManager.h" using namespace std;