From 60d42744edd50a9a98fcaf8a349df4c2c2a18d32 Mon Sep 17 00:00:00 2001
From: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date: Thu, 6 Jul 2017 16:02:42 +0800
Subject: [PATCH] fix bug caused by PR #371

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
---
 completions/bash/oci-runtime-tool | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/completions/bash/oci-runtime-tool b/completions/bash/oci-runtime-tool
index 1c91b4e5a..e9db5fa0f 100644
--- a/completions/bash/oci-runtime-tool
+++ b/completions/bash/oci-runtime-tool
@@ -333,12 +333,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