Commit 32d9b6b1 authored by Ina Curdt's avatar Ina Curdt
Browse files

Merge branch 'DEVELOP' of...

Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-65-Störung-bearbeiten
parents b7f9266a 0c02d5d4
...@@ -18,6 +18,7 @@ target/ ...@@ -18,6 +18,7 @@ target/
*.iws *.iws
*.iml *.iml
*.ipr *.ipr
*.log
### NetBeans ### ### NetBeans ###
/nbproject/private/ /nbproject/private/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment