aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorShinsuke Nishio <nishio@densan-labs.net>2016-01-31 16:33:29 +0900
committerShinsuke Nishio <nishio@densan-labs.net>2016-01-31 16:33:29 +0900
commit6a9340ea2cf96f283e26b996b88d2c520401bd21 (patch)
treee9b4a5b11311b2369729c60d8ddeda532c0eb324 /.gitignore
parent85dc025c4339cfa7f629809aa8ed0ee2ebdb6cb1 (diff)
parent96ab7a75f14d9990f3c8f1255f9790c496a64473 (diff)
downloadbbprb-6a9340ea2cf96f283e26b996b88d2c520401bd21.tar.gz
merge pr/71 and resolve conflict
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index de7d788..4ed3c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
.idea
bitbucket-pullrequest-builder.iml
-target
+target/
work