Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2025-04-07 01:31:50 +00:00
Code Issues Releases Activity

docs: Fix lingering merge conflict in config docs

Browse Source
This commit is contained in:
Matan Kushner 2019-10-10 13:45:59 +09:00
parent 9d48706360
commit f51f3edf76
No known key found for this signature in database
GPG Key ID: 4B98C3A8949CA8A4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/config/README.md
View File

@ -895,22 +895,13 @@ To enable it, set `disabled` to `false` in your configuration file.
### Options ### Options
<<<<<<< HEAD
| Variable | Default | Description | | Variable | Default | Description |
| ----------------- | ------------- | ------------------------------------------------------------------------------------------------------------------- | | ----------------- | ------------- | ------------------------------------------------------------------------------------------------------------------- |
| `12hr` | `false` | Enables 12 hour formatting | | `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. | | `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 | | `style` | `bold yellow` | The style for the module time |
| `disabled` | `true` | Disables the `time` module. | | `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. | | `utc_time_offset` | `local` | Sets the UTC offset to use. Range from -24 < x < 24. Allows floats to accommodate 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
If `use_12hr` is `true`, then `format` defaults to `"%r"`. Otherwise, it defaults to `"%T"`. If `use_12hr` is `true`, then `format` defaults to `"%r"`. Otherwise, it defaults to `"%T"`.
Manually setting `format` will override the `use_12hr` setting. Manually setting `format` will override the `use_12hr` setting.
@ -923,6 +914,7 @@ Manually setting `format` will override the `use_12hr` setting.
[time] [time]
disabled = false disabled = false
format = "🕙[ %T ]" format = "🕙[ %T ]"
utc_time_offset = -5
``` ```
## Username ## Username