summaryrefslogtreecommitdiff
path: root/.config/sway/config.d/theme
diff options
context:
space:
mode:
Diffstat (limited to '.config/sway/config.d/theme')
-rw-r--r--.config/sway/config.d/theme6
1 files changed, 6 insertions, 0 deletions
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index beb58d2..597b178 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -1,8 +1,14 @@
### Set borders
gaps inner $gaps
+<<<<<<< HEAD
for_window [class="^.*"] border pixel 2
default_border pixel 2
default_floating_border pixel 2
+=======
+for_window [class="^.*"] border pixel 0
+default_border pixel 0
+default_floating_border pixel 0
+>>>>>>> b688e13 (shinji)
### Colors