summaryrefslogtreecommitdiff
path: root/local_config.example
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2011-04-17 03:26:03 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2011-04-17 03:26:03 -0300
commite891caf97ee563e52b8f5e1f2448db2b0dc49228 (patch)
treed74e4ba4d4e53b682731aa866afc27e8bdd57686 /local_config.example
parent86d44994d4129c0cf0ffdc9cba71303b870f14d8 (diff)
More merge fixes
Diffstat (limited to 'local_config.example')
0 files changed, 0 insertions, 0 deletions