diff options
| author | psargent <philip.sargent@gmail.com> | 2019-07-02 19:04:13 +0100 |
|---|---|---|
| committer | psargent <philip.sargent@gmail.com> | 2019-07-02 19:04:13 +0100 |
| commit | 2d7892e3b16841e494d43c5e0b25fbe599af777d (patch) | |
| tree | 88543219c54df2e5ac044b7202e1846d46586a55 | |
| parent | 12c8ab41bf99bd3d04c8d1788f3d107047278517 (diff) | |
| parent | 8edeb2f6229301bd13be80e242269ae1ed878c38 (diff) | |
| download | troggle-2d7892e3b16841e494d43c5e0b25fbe599af777d.tar.gz troggle-2d7892e3b16841e494d43c5e0b25fbe599af777d.tar.bz2 troggle-2d7892e3b16841e494d43c5e0b25fbe599af777d.zip | |
Merge remote-tracking branch 'troggle/master'
| -rw-r--r-- | .hgignore | 16 | ||||
| -rw-r--r-- | localsettingsdocker.py | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | modelviz.py | 0 |
3 files changed, 1 insertions, 17 deletions
diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 6cbf023..0000000 --- a/.hgignore +++ /dev/null @@ -1,16 +0,0 @@ -# use glob syntax -syntax: glob - -*.pyc -db* -localsettings.py -*~ -parsing_log.txt -troggle -troggle_log.txt -.idea/* -*.orig -media/images/* -.vscode/* -.swp -imagekit-off/ diff --git a/localsettingsdocker.py b/localsettingsdocker.py index 331d23e..aa7e7a9 100644 --- a/localsettingsdocker.py +++ b/localsettingsdocker.py @@ -1,5 +1,5 @@ import sys -# link localsettings to this file for use on expo computer in austria +# This is the local settings for use with the docker compose dev setup. It is imported automatically DATABASES = { 'default': { diff --git a/modelviz.py b/modelviz.py index e3ada4b..e3ada4b 100755..100644 --- a/modelviz.py +++ b/modelviz.py |