diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /punani/db | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'punani/db')
| -rw-r--r-- | punani/db/punani | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/punani/db/punani b/punani/db/punani index ad477dab..e5d1f383 100644 --- a/punani/db/punani +++ b/punani/db/punani @@ -43,7 +43,7 @@ }, "tinc" : { "apt-get" : "tinc", - "yaourt" : "tinc" + "pacman" : "tinc" }, "python-notify" : { "pacman" : "python-notify", |