Resolve merge conflicts

This commit is contained in:
Griatch 2020-04-13 11:22:19 +02:00
commit 74b73c69f9
3 changed files with 64 additions and 29 deletions

View file

@ -10,7 +10,7 @@
- New `utils.format_grid` for easily displaying long lists of items in a block.
- Using `lunr` search indexing for better `help` matching and suggestions. Also improve
the main help command's default listing output.
- Added `content_types` indexing to DefaultObject's ContentsHandler. (volund)
### Already in master
- `is_typeclass(obj (Object), exact (bool))` now defaults to exact=False