diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-16 09:44:44 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-16 09:44:44 -0500 |
commit | c76ecd8ae9425f0717f30cdac8e47485c887bcb6 (patch) | |
tree | 12d31e73cfaffa6578651b4d0843dd3ba867bcc4 /local_config | |
parent | cad2d8b7075cb255f76e79c12c23acee94074514 (diff) | |
parent | 0f9c53d616116cac705b01bfabb2186506aac52a (diff) |
Merge branch 'master' into cleanup
Conflicts:
cron-jobs/ftpdir-cleanup
cron-jobs/sourceballs
db-functions
db-move
db-remove
db-sync
db-update
get-repos
local_config
testing2x
yf-update
Diffstat (limited to 'local_config')
-rw-r--r-- | local_config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/local_config b/local_config index d329e17..9b4415e 100644 --- a/local_config +++ b/local_config @@ -11,7 +11,7 @@ mirror="mirrors.kernel.org" mirrorpath="archlinux" # mkrepo -repodir=${_paraboladir}/repo +repodir=${_paraboladir} # yf-update blacklist=${_paraboladir}/docs/blacklist.txt |