From 2b195dd789250b57547fe58f168a3f39e57c98d4 Mon Sep 17 00:00:00 2001
From: devxpy <devxpy@gmail.com>
Date: Thu, 8 Nov 2018 06:00:09 +0530
Subject: [PATCH] fix errors from merge

---
 pipenv/cli/options.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pipenv/cli/options.py b/pipenv/cli/options.py
index fa20fc9403..5c4a991f9a 100644
--- a/pipenv/cli/options.py
+++ b/pipenv/cli/options.py
@@ -126,7 +126,6 @@ def callback(ctx, param, value):
         state.installstate.skip_lock = value
         return value
     return option("--skip-lock", is_flag=True, default=False, expose_value=False,
-                    help=u"Ignore locking mechanisms when installing—use the Pipfile, instead.",
                     help=u"Skip locking mechanisms and use the Pipfile instead during operation.",
                     envvar="PIPENV_SKIP_LOCK",
                     callback=callback, type=click.types.BOOL)(f)