fixed merge conflicts that were missed
This commit is contained in:
		
							parent
							
								
									38ad8a276f
								
							
						
					
					
						commit
						2f05e9421d
					
				
					 1 changed files with 1 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -298,11 +298,10 @@ awful.screen.connect_for_each_screen(function(s)
 | 
			
		|||
 | 
			
		||||
    s.myrightwidgets =
 | 
			
		||||
        { -- Right widgets
 | 
			
		||||
            layout = wibox.layout.ratio.horizontal,
 | 
			
		||||
            layout = wibox.layout.align.horizontal,
 | 
			
		||||
            s.mytasklist, -- Middle widget
 | 
			
		||||
            s.mysystray,
 | 
			
		||||
            s.mylayoutbox,
 | 
			
		||||
            inner_fill_strategy = "right"
 | 
			
		||||
        }
 | 
			
		||||
    -- Add widgets to the wibox
 | 
			
		||||
    s.mywibox:setup {
 | 
			
		||||
| 
						 | 
				
			
			@ -324,7 +323,6 @@ awful.screen.connect_for_each_screen(function(s)
 | 
			
		|||
            mytextclock,
 | 
			
		||||
            wibox.container.margin (s.mylayoutbox,0,25,0,0),
 | 
			
		||||
        },
 | 
			
		||||
        expand = "outside"
 | 
			
		||||
    }
 | 
			
		||||
end)
 | 
			
		||||
-- }}}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue