missed merge artifact

Author: antonydellavecchia

experimental/Parallel/docs/src/introduction.md

@@ -26,7 +26,6 @@ oscar_worker_pool
 
 ## Slightly advanced distributed computing with centralized bookkeeping
 ```@docs
->>>>>>> Matthias/oscar_workerpool
 compute_distributed!
 pop_task!
 process_result!