fix

docs.it4i/anselm/storage.md

@@ -384,17 +384,10 @@ Once done, please remember to unmount the storage
 $ fusermount -u cesnet
 ```
 
-<<<<<<< HEAD:docs.it4i/anselm/storage.md
-### Rsync Access
-
-!!! note
-    Rsync provides delta transfer for best performance, can resume interrupted transfers
-=======
 ### RSYNC access
 
 !!! Note "Note"
 	RSYNC provides delta transfer for best performance, can resume interrupted transfers
->>>>>>> Spelling corrections:docs.it4i/anselm-cluster-documentation/storage.md
 
 RSYNC is a fast and extraordinarily versatile file copying tool. It is famous for its delta-transfer algorithm, which reduces the amount of data sent over the network by sending only the differences between the source files and the existing files in the destination.  RSYNC is widely used for backups and mirroring and as an improved copy command for everyday use.
 

docs.it4i/salomon/software/ansys/ansys-ls-dyna.md

@@ -50,10 +50,6 @@ echo Machines: $hl
 /ansys_inc/v145/ansys/bin/ansys145 -dis -lsdynampp i=input.k -machines $hl
 ```
 
-<<<<<<< HEAD
-Header of the pbs file (above) is common and description can be find on [this site](../../job-submission-and-execution/). [SVS FEM](http://www.svsfem.cz) recommends to utilize sources by keywords: nodes, ppn. These keywords allows to address directly the number of nodes (computers) and cores (ppn) which will be utilized in the job. Also the rest of code assumes such structure of allocated resources.
-=======
 Header of the PBS file (above) is common and description can be find on [this site](../../resource-allocation-and-job-execution/job-submission-and-execution/). [SVS FEM](http://www.svsfem.cz) recommends to utilize sources by keywords: nodes, ppn. These keywords allows to address directly the number of nodes (computers) and cores (ppn) which will be utilized in the job. Also the rest of code assumes such structure of allocated resources.
->>>>>>> Spelling corrections
 
 Working directory has to be created before sending PBS job into the queue. Input file should be in working directory or full path to input file has to be specified. Input file has to be defined by common LS-DYNA .**k** file which is attached to the ansys solver via parameter i=