Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetSecureZrtpTelephony.java b/src/net/java/sip/communicator/service/protocol/OperationSetSecureZrtpTelephony.java
index 7213af4..eb5dcdd 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetSecureZrtpTelephony.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetSecureZrtpTelephony.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,15 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.service.protocol;

-

-/**

- * Marker interface to indicate that a protocol supports ZRTP encryption.

- *

- * @author Ingo Bauersachs

- */

-public interface OperationSetSecureZrtpTelephony

-    extends OperationSetSecureTelephony

-{

-

-}

+package net.java.sip.communicator.service.protocol;
+
+/**
+ * Marker interface to indicate that a protocol supports ZRTP encryption.
+ *
+ * @author Ingo Bauersachs
+ */
+public interface OperationSetSecureZrtpTelephony
+    extends OperationSetSecureTelephony
+{
+
+}