diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-28 12:34:01 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-28 12:34:01 -0500 |
| commit | 69d09d906230c9f22699075c1ea07970b21e8ab4 (patch) | |
| tree | d9f1f65280b75503cad0c5f58809e38aa0864b44 /docs/.gitignore | |
| parent | 0c1c39b02f1e0348d8e317972601e2db514db103 (diff) | |
| parent | fd685bae73933434b4c4fd0689898407fd4f9058 (diff) | |
| download | pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.tar.gz pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.tar.bz2 pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.zip | |
resolve conflict
Diffstat (limited to 'docs/.gitignore')
| -rw-r--r-- | docs/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/.gitignore b/docs/.gitignore index 30d731d4a..da7abd0c0 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,4 @@ +_themes _build |