Fix merge error
authorChristian Schneider <cschneid@adobe.com>
Thu, 3 Jan 2019 15:00:06 +0000 (16:00 +0100)
committerChristian Schneider <cschneid@adobe.com>
Thu, 3 Jan 2019 15:00:06 +0000 (16:00 +0100)
commit1163a8756545a2c667e650fbdb570a83767f1b33
tree1bb188860d29aeb5728844a6ae50f5602e6a985f
parente8b41131e097f473e0d34ed1429965e00c0a7728
Fix merge error
org.apache.aries.events.api/src/main/java/org/apache/aries/events/api/Position.java