Resolve conflict

JuliaIO · Jul 24, 2023 · 001756a · 001756a
1 parent 43f9ebf
commit 001756a
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 89 deletions.
diff --git a/docs/juliacon_2023/juliacon_2023_presentation.html b/docs/juliacon_2023/juliacon_2023_presentation.html
diff --git a/docs/juliacon_2023/juliacon_2023_presentation.md b/docs/juliacon_2023/juliacon_2023_presentation.md
@@ -283,9 +283,6 @@ Where are the compressed chunks and can we decompress them in parallel?
 
 ---
 
-<<<<<<< HEAD
-# Parallelization via Message Passing Interface (MPI)
-=======
 # Concurrency with Direct I/O
 
 * The HDF5 C library provides byte offsets for continguous and chunked datasets
@@ -317,7 +314,6 @@ create_dataset(h5f, "dataset", datatype, space;
 ---
 
 # Parallelization via MPI
->>>>>>> e0d07a75b1dec46114997a076069748edab6d75d
 
 - Message Passing Interface (MPI) is an interface for single-program, multiple-data (SPMD) parallelism.
  - Launch multiple processes running the same program

diff --git a/docs/juliacon_2023/juliacon_2023_presentation.pdf b/docs/juliacon_2023/juliacon_2023_presentation.pdf