diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-02 20:39:59 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-02 20:39:59 +0200 |
| commit | b082f919d73291c0bd832154af9b7b68f7d9f8e0 (patch) | |
| tree | aea71ca6d12519135b5cff04fcbff004e9c567b5 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 41d3b019d1618a00f4fe40371b0f339d8cc193d6 (diff) | |
| parent | 25211f13b37ecef64d6fa9a382a2c30d212452ae (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index bbfedb22a..68ad2c122 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -67,7 +67,6 @@ public final class Config { public static final int SOCKET_TIMEOUT = 15; public static final int CONNECT_TIMEOUT = 60; public static final int CONNECT_DISCO_TIMEOUT = 30; - public static final int CARBON_GRACE_PERIOD = 90; public static final int MINI_GRACE_PERIOD = 750; |