diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-08-13 22:18:42 +0100 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-08-13 22:18:42 +0100 |
| commit | b300dc1d2c40876bb4108a80194e3b196d900a1d (patch) | |
| tree | d1139fb38611dc05e2eafefb22a24ff7bf1e0da4 /.gitignore | |
| parent | d0e378f63aa92fe7257aef89ec747809a461a48f (diff) | |
| parent | 4730c3b46ee0dd9b99b1873c167055738ef7a45c (diff) | |
| download | etherpad-lite-b300dc1d2c40876bb4108a80194e3b196d900a1d.zip | |
fixed merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2,3 +2,7 @@ node_modules settings.json static/js/jquery.min.js APIKEY.txt +bin/abiword.exe +bin/node.exe +etherpad-lite-win.zip +var/dirty.db |