Commit bf484888 authored by Petr Strakos's avatar Petr Strakos

merge

parent 53d6e8ee
...@@ -48,7 +48,6 @@ It will generate the CxxFullExampleAdaptor executable file. This can be later ru ...@@ -48,7 +48,6 @@ It will generate the CxxFullExampleAdaptor executable file. This can be later ru
Provided example is a simple MPI program. Main executing part is written in FEDriver.cxx. It is a simulator code that creates computational grid Provided example is a simple MPI program. Main executing part is written in FEDriver.cxx. It is a simulator code that creates computational grid
<<<<<<< HEAD
```c++ ```c++
#include "FEDataStructures.h" #include "FEDataStructures.h"
#include <mpi.h> #include <mpi.h>
...@@ -114,15 +113,6 @@ int main(int argc, char** argv) ...@@ -114,15 +113,6 @@ int main(int argc, char** argv)
MPI_Finalize(); MPI_Finalize();
return 0; return 0;
=======
``` line-numbers
#include ahoj.h
int main() {
return 0;
>>>>>>> 35cff1d02526d96d67e349fa8874843cbe149def
} }
``` ```
......
.line-numbers{
/* Set "line-numbers-counter" to 0 */
counter-reset: line-numbers-counter;
}
.line-numbers .remark-code-line::before {
/* Increment "line-numbers-counter" by 1 */
counter-increment: line-numbers-counter;
content: counter(line-numbers-counter);
text-align: right;
width: 55px;
border-right: 1px solid #aaa;
display: inline-block;
margin-right: 10px;
padding: 0 5px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment