conflict fix

This commit is contained in:
Vladimir Markelov 2018-08-13 21:45:44 -07:00
commit e0218b9490
2 changed files with 8 additions and 8 deletions

View File

@ -13,12 +13,12 @@ The current version is 0.9.0 RC2. Please see details in [changelog](./changelog)
* Terminal FB2 reader(termfb2): https://github.com/VladimirMarkelov/termfb2
## Documentation
* ![Introduction](/docs/intro.md)
* ![Getting started](/docs/hello.md)
* ![Layout manager](/docs/layout.md)
* ![Basic standrd control methods and properties](/docs/widget.md)
* ![About Windows](/docs/window.md)
* ![Predefined hotkeys](/docs/hotkeys.md)
* [Introduction](/docs/intro.md)
* [Getting started](/docs/hello.md)
* [Layout manager](/docs/layout.md)
* [Basic standrd control methods and properties](/docs/widget.md)
* [About Windows](/docs/window.md)
* [Predefined hotkeys](/docs/hotkeys.md)
## The list of available controls
* Window (Main control container - with maximize, window order and other window features)
@ -38,7 +38,7 @@ The current version is 0.9.0 RC2. Please see details in [changelog](./changelog)
* BarChart (Horizontal bar chart without scroll)
* SparkChart (Show tabular data as a bar graph)
* GridView (Table to show structured data - only virtual and readonly mode with scroll support)
* ![FilePicker](/docs/fselect.md)
* [FilePicker](/docs/fselect.md)
* LoginDialog - a simple authorization dialog with two fields: Username and Password
## Screenshots

View File

@ -50,5 +50,5 @@ dlg.OnClose(func() {
})
```
Please, check the ![dialog demo](/demos/fileselect/fselect.go) for more details.
Please, check the [dialog demo](/demos/fileselect/fselect.go) for more details.