Skip to content
Snippets Groups Projects
Commit 40bcb059 authored by Mohcine Chraibi's avatar Mohcine Chraibi
Browse files

solve conflict in readme

parents 3004a105 a8c89c4b
Branches
Tags
No related merge requests found
Pipeline #
JPSreport steps JPSreport steps
* Define all input parameters via commandline or initialization file * Define all input parameters via commandline or initialization file
* Read/Parse the input parameters * Read/Parse the input parameters
* Read/Parse the geometry from the predefined format (e.g Travisto) to the internal boostformat * Read/Parse the geometry from the predefined format (e.g JPSvis) to the internal boostformat
* Voronoi-cell generation * Voronoi-cell generation
* Results/Diagrams * Results/Diagrams
* Cells clipping with the geometry * Cells clipping with the geometry
* Output (Images...) * Output (Images...)
* User Interface * User Interface
* What is this? Please better explanations...
\ No newline at end of file
...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
Documentation can be found [here](http://jupedsim.github.io/jpsreport/) Documentation can be found [here](http://jupedsim.github.io/jpsreport/)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment