Manually merging?

awesome/module/notifications.lua

@@ -111,7 +111,6 @@ naughty.connect_signal(
 -- Naughty template
 naughty.connect_signal("request::display", function(n)
 
-<<<<<<< HEAD
     -- naughty.actions template
     local actions_template = wibox.widget {
         notification = n,
@@ -143,64 +142,6 @@ naughty.connect_signal("request::display", function(n)
         style = { underline_normal = false, underline_selected = true },
         widget = naughty.list.actions
     }
-=======
-	-- naughty.actions template
-	local actions_template = wibox.widget {
-		notification = n,
-		base_layout = wibox.widget {
-			spacing        = dpi(4),
-			layout         = wibox.layout.flex.horizontal
-		},
-		widget_template = {
-			{
-				{
-					{
-						{
-							id     = 'text_role',
-							font   = 'VictorMono Nerd Font 10',
-							widget = wibox.widget.textbox
-						},
-						widget = wibox.container.place
-					},
-					widget = clickable_container
-				},
-				bg                 = beautiful.groups_bg,
-				shape              = gears.shape.rounded_rect,
-				forced_height      = dpi(35),
-				widget             = wibox.container.background
-			},
-			margins = dpi(8),
-			widget  = wibox.container.margin
-		},
-		style = { underline_normal = false, underline_selected = true },
-		widget = naughty.list.actions
-	}
-
-<<<<<<< HEAD
-	-- Custom notification layout
-	naughty.layout.box {
-		notification = n,
-		type = "notification",
-		screen = awful.screen.preferred(),
-		shape = gears.shape.rectangle,
-		widget_template = {
-			{
-				{
-					{
-						{
-							{
-								{
-									{
-										{
-											{
-												{
-													{
-														markup = n.app_name or 'System Notification',
-														font = 'VictorMono Nerd Font 10',
-														align = 'center',
-														valign = 'center',
-														widget = wibox.widget.textbox
->>>>>>> 1d4ba76... making nice only work on desktop for now
 
     -- Custom notification layout
     naughty.layout.box {
@@ -396,7 +337,6 @@ naughty.connect_signal("request::display", function(n)
         bg = beautiful.transparent,
         widget = wibox.container.background
     }
->>>>>>> 1d4ba76... making nice only work on desktop for now
 
     -- Destroy popups if dont_disturb mode is on
     -- Or if the right_panel is visible