diff options
author | Shinsuke Nishio <nishio@densan-labs.net> | 2016-01-31 16:33:29 +0900 |
---|---|---|
committer | Shinsuke Nishio <nishio@densan-labs.net> | 2016-01-31 16:33:29 +0900 |
commit | 6a9340ea2cf96f283e26b996b88d2c520401bd21 (patch) | |
tree | e9b4a5b11311b2369729c60d8ddeda532c0eb324 /.gitignore | |
parent | 85dc025c4339cfa7f629809aa8ed0ee2ebdb6cb1 (diff) | |
parent | 96ab7a75f14d9990f3c8f1255f9790c496a64473 (diff) | |
download | bbprb-6a9340ea2cf96f283e26b996b88d2c520401bd21.tar.gz |
merge pr/71 and resolve conflict
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ .idea bitbucket-pullrequest-builder.iml -target +target/ work |