sewar

Index: demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/ChildController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/ChildController.java	(revision effa410eaebd8dbd0baedd2fc2939d24c3e6ff85)
+++ demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/ChildController.java	(revision )
@@ -8,11 +8,16 @@
 import android.view.ViewGroup;
 import android.widget.TextView;

sewar

Index: demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java	(revision df27bfaa3d5a2f8a552bb5ad18a3a26960647b62)
+++ demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java	(revision )
@@ -15,12 +15,13 @@
 import com.bluelinelabs.conductor.support.RouterPagerAdapter;
 

sewar

# Redirect code.* to github code page
server {
    listen 80;
    server_name code.edid.co code.edid.tv;
    rewrite ^(.*) https://github.com/timvideos/edid.tv permanent;
}

# Redirect www.* and alternative domains to main domain
server {
    listen 80;