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

awesome/rc.lua

@@ -41,7 +41,6 @@ require('module.brightness-osd')
 -- require('module.battery-notifier')
 -- require('module.lockscreen')
 
-<<<<<<< HEAD
 -- }}}
 
 -- -- {{{ Error handling
@@ -69,12 +68,6 @@ require('module.brightness-osd')
 -- end
 -- -- }}}
 
-<<<<<<< HEAD
->>>>>>> 05f8e08... making nice only work on desktop for now
-=======
-=======
->>>>>>> bdc9927... Added more of awesome into fennel over lua
->>>>>>> 1d4ba76... making nice only work on desktop for now
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
 beautiful.init("/home/chris/.config/awesome/theme.lua")
@@ -745,12 +738,6 @@ end)
 -- Enable nice titlebars
 -- nice()
 
-=======
--- Enable nice titlebars
--- nice()
-
->>>>>>> 1d4ba76... making nice only work on desktop for now
-
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}

picom.conf

@@ -160,7 +160,6 @@ inactive-opacity-override = false;
 
 # Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
 active-opacity = 0.8;
->>>>>>> 1d4ba76... making nice only work on desktop for now
 
 # Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
 # inactive-dim = 0.0
@@ -199,7 +198,6 @@ opacity-rule = [
   "100:class_g    = 'firefox'",
   "100:class_g    = 'dolphin'",
   "100:class_g    = 'mpv'",
->>>>>>> 1d4ba76... making nice only work on desktop for now
   "100:class_g    = 'libreoffice'",
   "100:class_g    = 'Thunderbird'"
 ];
@@ -265,12 +263,9 @@ blur-background-exclude = [
   # https://github.com/naelstrof/maim/issues/130
   "class_g = 'slop'",
   "_GTK_FRAME_EXTENTS@:c",
+  "class_g = 'soffice'",
   # "window_type = '_NET_WM_WINDOW_TYPE_NOTIFICATION'"
   "window_type = 'notification'"
-=======
-  "class_g = 'soffice'",
-  "_GTK_FRAME_EXTENTS@:c"
->>>>>>> 1d4ba76... making nice only work on desktop for now
 ];