aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-09 14:21:35 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-09 14:21:35 +0100
commit78370094e9c9c2f58cb5f969217db555f9a283c2 (patch)
tree5a5651c4128685bfe82437f777748b296e21cb33 /src/main/java/eu/siacs/conversations/Config.java
parent9d52f627670e5785e44b8b163dc29fadba007e44 (diff)
cleanup: removed unused emoticon parsing
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java1
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 7af29451..d777e5cc 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -18,7 +18,6 @@ public final class Config {
public static final int MESSAGE_MERGE_WINDOW = 20;
- public static final boolean PARSE_EMOTICONS = false;
public static final int PROGRESS_UI_UPDATE_INTERVAL = 750;
public static final boolean NO_PROXY_LOOKUP = false; //useful to debug ibb