diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 06:30:22 +0100 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-11-27 06:30:22 +0100 |
| commit | 7e66dda705743cbfe1d522ddb73e5694006ec42c (patch) | |
| tree | c08b63deb28c09ec49d9173280f1ca234debfe50 /.gitignore | |
| parent | 7eceb03f083643254c7393c6b5ebe539e344a1ba (diff) | |
| parent | e101593561a10632c1d63180436b19f1d7115046 (diff) | |
Merge branch 'refs/heads/develop' into feature/unit-tests
Conflicts:
user_guide/helpers/number_helper.html
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d740c498f..11fb6d67c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,9 @@ application/cache/* application/logs/* !application/logs/index.html -!application/logs/.htaccess
\ No newline at end of file +!application/logs/.htaccess + +user_guide_src/build/* +user_guide_src/cilexer/build/* +user_guide_src/cilexer/dist/* +user_guide_src/cilexer/pycilexer.egg-info/*
\ No newline at end of file |