diff options
| author | prashantsinalkar | 2019-10-02 20:32:05 +0530 |
|---|---|---|
| committer | prashantsinalkar | 2019-10-02 20:32:05 +0530 |
| commit | cb37e15ceb336de7ba94d90805ef1531c47d5c96 (patch) | |
| tree | 9cba0c741a7cfe3222e2c17401e72b2acc8dedf7 /.gitignore | |
| parent | 76dcbadbf71febe93fb9d2ffd51b2f3ae54233a2 (diff) | |
| parent | 070cb90095df4ab5bc7b6e28fd13bb12df29e1f7 (diff) | |
| download | R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.gz R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.bz2 R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.zip | |
fixed conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,7 +9,7 @@ *.swo *.pyc - -static/log/*.txt -static/tmp/*.R +static/*.* +website/static/log/*.txt +website/static/tmp/*.R R_on_Cloud/config.py |