Merge pull request #418 from Mashimiao/fix-371

fix bug caused by PR #371

Author: Mrunal Patel

completions/bash/oci-runtime-tool

@@ -338,12 +338,6 @@ _oci-runtime-tool_generate() {
 		--linux-uidmappings
 		--mount-bind
 		--mount-cgroups
-<<<<<<< c1b5a024416a8eeae3984360e6eb61bec47f115f
-		--mount-label
-		--oom-score-adj
-=======
-		--os
->>>>>>> generate: rectify the arguments
 		--output
 		--process-cwd
 		--process-gid