aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPacien2016-03-01 18:45:54 +0100
committerPacien2016-03-01 18:45:54 +0100
commit264fec2ec938a6c525ca6f569692118a8216ca19 (patch)
tree0cf7fe569b6de16c4bd4dc8776fb82dfeeda312e /.gitignore
parent45880b06c053e75e1778a598245015c65440a5bc (diff)
parentcc88afb9fe448b759966e94b07692fb6a154b2bf (diff)
downloadxblast-264fec2ec938a6c525ca6f569692118a8216ca19.tar.gz
Merge branch '02_board' into 'master' 02_board
02 board See merge request !1
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5a61770..de15d2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,7 @@ local.properties
54.mtj.tmp/ 54.mtj.tmp/
55 55
56# Package Files # 56# Package Files #
57*.jar 57#*.jar
58*.war 58*.war
59*.ear 59*.ear
60 60