fixed merge conflicts that were missed

This commit is contained in:
Chris Cochrun 2020-06-04 07:02:15 -05:00
parent 38ad8a276f
commit 2f05e9421d

View file

@ -298,11 +298,10 @@ awful.screen.connect_for_each_screen(function(s)
s.myrightwidgets = s.myrightwidgets =
{ -- Right widgets { -- Right widgets
layout = wibox.layout.ratio.horizontal, layout = wibox.layout.align.horizontal,
s.mytasklist, -- Middle widget s.mytasklist, -- Middle widget
s.mysystray, s.mysystray,
s.mylayoutbox, s.mylayoutbox,
inner_fill_strategy = "right"
} }
-- Add widgets to the wibox -- Add widgets to the wibox
s.mywibox:setup { s.mywibox:setup {
@ -324,7 +323,6 @@ awful.screen.connect_for_each_screen(function(s)
mytextclock, mytextclock,
wibox.container.margin (s.mylayoutbox,0,25,0,0), wibox.container.margin (s.mylayoutbox,0,25,0,0),
}, },
expand = "outside"
} }
end) end)
-- }}} -- }}}