From c8277522d30b788975b1d099f02a98f245a9251c Mon Sep 17 00:00:00 2001
From: Tristaan <tristan.sneider@gmail.com>
Date: Sat, 27 Jan 2018 14:36:45 +0100
Subject: [PATCH] solved conflicts

---
 .config/polybar/config   | 3 ++-
 .config/ranger/bookmarks | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index dc69d7f..5632728 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -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%
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index ff7661b..91c0b52 100755
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -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