solved conflicts

This commit is contained in:
Tristaan
2018-01-27 14:36:45 +01:00
parent cc02c6e367
commit c8277522d3
2 changed files with 2 additions and 2 deletions

View File

@@ -34,7 +34,7 @@ bright_white = '0xd7d7d7'
[bar/top]
monitor = ${env:MONITOR}
monitor = ${env:MONITOR:eDP-1}
width = 100%
height = 30
;offset-x = 1%
@@ -135,6 +135,7 @@ format-unmounted = <label-unmounted>
mount-0 = /
mount-1 = /media
mount-2 = /home
label-mounted = %{F#55b7b7}%mountpoint%%{F-}: %free%
label-unmounted = %mountpoint%

View File

@@ -1,4 +1,3 @@
':/media/Downloads/Old Linux Games (x86)/Heavy Metal FAKK2
v:/home/tristan/build/rineja/app/views
a:/home/tristan/build/rineja/app/assets
c:/home/tristan/build/rineja/app/controllers