diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:15:05 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:15:05 +0100 |
| commit | f5d3c9d28196a1678647fe3239fa3eaf633e6c41 (patch) | |
| tree | 9f04cee73b8f5080925cbf1ec09768cd12e20664 /settings.py | |
| parent | dde16108dd8e7ed6159aadd304c5fb8ced36e517 (diff) | |
| download | troggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.tar.gz troggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.tar.bz2 troggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.zip | |
[svn] Fix edit conflict screwup
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8041 by aaron @ 10/27/2008 6:12 PM
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions