summaryrefslogtreecommitdiff
path: root/src/ui/sidebarwidget.h
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-06-25 16:26:53 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-06-25 16:26:53 +0300
commit5dbc85eaaa1bd0a0fc11dd76a75ece2efe763df5 (patch)
tree9721fb7aced603adb10b9bb3f3beb3f8d5fba973 /src/ui/sidebarwidget.h
parent95c527db1484f7758a180c6de051d0182c3b2e81 (diff)
parentf99a9111170f2ff28383fd3172fdaf4b9a1ba069 (diff)
Merge branch 'work/v1.6' into work/serious-unicode
# Conflicts: # res/fonts/SmolEmoji-Regular.ttf
Diffstat (limited to 'src/ui/sidebarwidget.h')
-rw-r--r--src/ui/sidebarwidget.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 2e418aa4..130242ab 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -36,8 +36,8 @@ enum iSidebarMode {
36const char * icon_SidebarMode (enum iSidebarMode mode); 36const char * icon_SidebarMode (enum iSidebarMode mode);
37 37
38enum iSidebarSide { 38enum iSidebarSide {
39 left_SideBarSide, 39 left_SidebarSide,
40 right_SideBarSide, 40 right_SidebarSide,
41}; 41};
42 42
43enum iFeedsMode { 43enum iFeedsMode {