more js: Slot.js plus dist version

[iotcloud.git] / src / java / iotcloud / Slot.java

diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java
index c114a8762c0eba7f83fdfe03178fc89000ffca5a..2a66fa311d511be196d753a998d6bdb275078460 100644 (file)
--- a/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@ -52,13 +52,9 @@ class Slot implements Liveness {
                this(_table, _seqnum, _machineid, _prevhmac, null);
        }
 
-<<<<<<< HEAD
-       Slot(long _seqnum, long _machineid) {
-               this(_seqnum, _machineid, new byte[ HMAC_SIZE], null);
-=======
+
        Slot(Table _table, long _seqnum, long _machineid) {
                this(_table, _seqnum, _machineid, new byte[HMAC_SIZE], null);
->>>>>>> f80cc30f294899f47cef3507334f8ca357862e5e
        }
 
        byte[] getHMAC() {