Merge branch 'master' of vi-di.fr:dotfiles

2015-10-14 14:54:30 +02:00 · 2015-10-14 14:54:30 +02:00 · f9a10e84df
commit f9a10e84df
parent acb57650bf 13c34a8d26
3 changed files with 2 additions and 3 deletions
--- a/1
+++ b/1
@ -624,4 +624,3 @@ export PYTHONSTARTUP=~/Programmation/dotfiles/startup.py
 #Launch startx when login
 [[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx

-calendar -f ~/calendar
--- a/3
+++ b/3
@ -30,12 +30,13 @@
 	textconv = odt2txt

 [push]
-	default = simple
+	default = current 

 [sendemail]
 	smtpencryption = tls
 	smtpserver = www.villaro-dixon.eu
 	smtpserverport = 587
 	smtpuser = frank_mail
+
 [credential]
 	helper = cache
--- a/install.sh
+++ b/install.sh
@ -118,7 +118,6 @@ if [ $(hostname) = "intersect" ]; then
 else
 	SECURE_DIR=~
 	echo "FIXME"
-	exit
 fi;

 #simple files