# Conflicts: # src/main/java/com/datadoghq/trace/impl/DDSpan.java # src/main/java/com/datadoghq/trace/writer/impl/DDApi.java # src/test/java/com/datadoghq/trace/impl/DDSpanTest.java |
||
---|---|---|
src | ||
.classpath | ||
.gitignore | ||
.project | ||
pom.xml |
# Conflicts: # src/main/java/com/datadoghq/trace/impl/DDSpan.java # src/main/java/com/datadoghq/trace/writer/impl/DDApi.java # src/test/java/com/datadoghq/trace/impl/DDSpanTest.java |
||
---|---|---|
src | ||
.classpath | ||
.gitignore | ||
.project | ||
pom.xml |