From f858e854bfe4027d52c084adaa49d235278ee397 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 2 Dec 2019 13:48:34 -0800 Subject: [PATCH] Fix a rebase mistake --- docs/commands/config.md | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/docs/commands/config.md b/docs/commands/config.md index ad868b7603..3998b0dea9 100644 --- a/docs/commands/config.md +++ b/docs/commands/config.md @@ -29,24 +29,13 @@ Syntax: `config {flags}` ### Variables -<<<<<<< HEAD -| Variable | Type | Description | +| Variable | Type | Description | | ---------- | ---------------- | ------------------------------------------------------- | -| path | table of strings | PATH to use to find binaries | -| env | row | the environment variables to pass to external commands | -| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses | -| table_mode | "light" or other | enable lightweight or normal tables | -| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode | -======= -| Variable | Type | Description | -| ------------- | ------------- | ----- | -| path | table of strings | PATH to use to find binaries | -| env | row | the environment variables to pass to external commands | -| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses | -| table_mode | "light" or other | enable lightweight or normal tables | -| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode | - -> > > > > > > origin/master +| path | table of strings | PATH to use to find binaries | +| env | row | the environment variables to pass to external commands | +| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses | +| table_mode | "light" or other | enable lightweight or normal tables | +| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode | ## Examples