You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/01/03 15:00:19 UTC

[aries-journaled-events] branch master updated: Fix merge error

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-journaled-events.git


The following commit(s) were added to refs/heads/master by this push:
     new 1163a87  Fix merge error
1163a87 is described below

commit 1163a8756545a2c667e650fbdb570a83767f1b33
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Jan 3 16:00:06 2019 +0100

    Fix merge error
---
 .../src/main/java/org/apache/aries/events/api/Position.java             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.apache.aries.events.api/src/main/java/org/apache/aries/events/api/Position.java b/org.apache.aries.events.api/src/main/java/org/apache/aries/events/api/Position.java
index 872c1c1..b26ddee 100644
--- a/org.apache.aries.events.api/src/main/java/org/apache/aries/events/api/Position.java
+++ b/org.apache.aries.events.api/src/main/java/org/apache/aries/events/api/Position.java
@@ -24,4 +24,6 @@ package org.apache.aries.events.api;
  */
 public interface Position extends Comparable<Position> {
 
+    String positionToString();
+
 }