merge

docs.it4i/software/viz/insitu.md

@@ -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   
 
 
-<<<<<<< HEAD
 ```c++
 #include "FEDataStructures.h"
 #include <mpi.h>
@@ -114,15 +113,6 @@ int main(int argc, char** argv)
   MPI_Finalize();
 
   return 0;
-=======
-``` line-numbers
-#include ahoj.h
-
-int main() {
-
-
-return 0;
->>>>>>> 35cff1d02526d96d67e349fa8874843cbe149def
 }
 ```
 

docs.it4i/software/viz/line-numbers

-.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;
-}