From f51f3edf76c4f69bb09dc1c8d7f8a3b578355e7a Mon Sep 17 00:00:00 2001 From: Matan Kushner Date: Thu, 10 Oct 2019 13:45:59 +0900 Subject: [PATCH] docs: Fix lingering merge conflict in config docs --- docs/config/README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/config/README.md b/docs/config/README.md index 620234cc..9243ca01 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -895,22 +895,13 @@ To enable it, set `disabled` to `false` in your configuration file. ### Options -<<<<<<< HEAD | Variable | Default | Description | | ----------------- | ------------- | ------------------------------------------------------------------------------------------------------------------- | | `12hr` | `false` | Enables 12 hour formatting | | `format` | see below | The [chrono format string](https://docs.rs/chrono/0.4.7/chrono/format/strftime/index.html) used to format the time. | | `style` | `bold yellow` | The style for the module time | | `disabled` | `true` | Disables the `time` module. | -| `utc_time_offset` | `local` | Sets the UTC offset to use. Range from -24 < x < 24. Allows floats to accomodate 30/45 minute timezone offsets. | -======= -| Variable | Default | Description | -| ---------- | ------------- | ------------------------------------------------------------------------------------------------------------------- | -| `use_12hr` | `false` | Enables 12 hour formatting | -| `format` | see below | The [chrono format string](https://docs.rs/chrono/0.4.7/chrono/format/strftime/index.html) used to format the time. | -| `style` | `bold yellow` | The style for the module time | -| `disabled` | `true` | Disables the `time` module. | ->>>>>>> master +| `utc_time_offset` | `local` | Sets the UTC offset to use. Range from -24 < x < 24. Allows floats to accommodate 30/45 minute timezone offsets. | If `use_12hr` is `true`, then `format` defaults to `"%r"`. Otherwise, it defaults to `"%T"`. Manually setting `format` will override the `use_12hr` setting. @@ -923,6 +914,7 @@ Manually setting `format` will override the `use_12hr` setting. [time] disabled = false format = "🕙[ %T ]" +utc_time_offset = -5 ``` ## Username