Fix merge conflicts

This commit is contained in:
Vrganj 2021-01-21 20:56:23 +01:00
commit a7055e742e
2 changed files with 172 additions and 68 deletions

View file

@ -1,7 +1,7 @@
#!/bin/bash
cd /tmp/$2
name=$(grep -Po "(?<=\n|\A)\s*(public\s+)?(class|interface)\s+\K([^\/\\\n\s{]+)" code.code)
name=$(grep -Po "(?<=\n|\A)\s*(public\s+)?(class|interface)\s+\K([^\/\\\\\n\s{]+)" code.code)
cp code.code $name.java
javac $name.java
timeout -s KILL 3 xargs -a args.args -d '\n' java $name < stdin.stdin