From 3a6cf7035e21803e9b37b8bcb5f863787a647d51 Mon Sep 17 00:00:00 2001
From: david <david@socialnerds.org>
Date: Sun, 2 Oct 2016 08:50:20 +0200
Subject: [PATCH] pushzshconfig 02.10.2016 08:50

---
 plugins/david.zsh  | 5 -----
 plugins/david.zsh~ | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/plugins/david.zsh b/plugins/david.zsh
index be149ba..8c65bde 100644
--- a/plugins/david.zsh
+++ b/plugins/david.zsh
@@ -51,7 +51,6 @@ rdp()
         domain="aec.at"
     fi
 
-<<<<<<< HEAD
     which rdesktop >/dev/null
     if [ $? -eq 0 ]; then
         #rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
@@ -65,10 +64,6 @@ rdp()
 	    exit 1
         fi
     fi
-=======
-    #rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
-    rdesktop -K -u $username -p - -d $domain -g workarea $server -k de -x l
->>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
 
 }
 
diff --git a/plugins/david.zsh~ b/plugins/david.zsh~
index 553e4f2..be149ba 100644
--- a/plugins/david.zsh~
+++ b/plugins/david.zsh~
@@ -12,16 +12,12 @@ alias vless="/usr/share/vim/vim73/macros/less.sh"
 alias publish="python2 -m SimpleHTTPServer"
 alias push="git push origin master"
 alias pull="git pull origin master"
-<<<<<<< HEAD
 alias dev="ssh -l david 10.9.0.43"
 alias t="todo.sh"
 alias vpn="sudo openvpn --writepid /var/run/openvpn --config /home/david/.vpn/david.conf"
 alias aec="sshuttle -vvr 90.146.8.233 192.168.6.0/24 90.146.8.0/26 10.9.0.0/26 10.12.0.0/16 10.2.0.0/26 192.168.3.0/24 10.12.4.0/22"
 alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/24"
-=======
-alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/26"
 alias aec="sshuttle -vvr 90.146.8.9 90.146.8.0/26"
->>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
 alias c="clear"
 alias bat="acpi && date"
 alias vn="vim ~/ownCloud/Notes/notes.md"