Delete .idea folder from repository

mpetazzoni · Feb 9, 2019 · e48dcc0 · e48dcc0
1 parent 5cb691f
commit e48dcc0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,13 +13,11 @@
 /.classpath
 /.project
 /.settings
-/.idea/workspace.xml
 # Ignore common editor swap files
 *.swp
 *.bak
 *~
-*~
 
 #ignore idea workspace file and idea module files
 *.iml
-.idea/workspace.xml
+.idea
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/common/src/main/java/com/turn/ttorrent/Constants.java b/common/src/main/java/com/turn/ttorrent/Constants.java
@@ -24,9 +24,12 @@
  * Time: 2:57 PM
  */
 public class Constants {
+
+
+
   public static final int DEFAULT_ANNOUNCE_INTERVAL_SEC = 15;
 
-  public final static int DEFAULT_SOCKET_CONNECTION_TIMEOUT_MILLIS = 100000;
+  public static final int DEFAULT_SOCKET_CONNECTION_TIMEOUT_MILLIS = 100000;
   public static final int DEFAULT_CONNECTION_TIMEOUT_MILLIS = 10000;
 
   public static final int DEFAULT_MAX_CONNECTION_COUNT = 100;