Merge branch 'master' into distributedcontext

open-telemetry · Jun 7, 2019 · 17fdd45 · 17fdd45
2 parents a770073 + e455cc6
commit 17fdd45
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,23 @@
+# IntelliJ IDEA
+.idea
+*.iml
+
+# Eclipse
+.classpath
+.project
+.settings
+bin
+
+# NetBeans
+/.nb-gradle
+/.nb-gradle-properties
+
+# OS X
+.DS_Store
+
+# Emacs
+*~
+\#*\#
+
+# Vim
+.swp