/**
 * Created by Martin on 03.09.2016.
 */
public class Test {
    public static void main(String[] args) {
        System.out.println("GitHub test");
    }
}

@@ -145,16 +145,52 @@
 test%22);%0A
+%09%09System.out.println(%22Local edit%22);%0A
     %7D%0A%7D%0A

Resolve conflict