solve conflicts
[sfa.git] / keyconvert /
drwxr-xr-x   ..
-rwxr-xr-x 2853 keyconvert.py
-rwxr-xr-x 1205 test.sh
-rw-r--r-- 58 test.txt
drwxr-xr-x - test
-rwxr-xr-x 247 testkey.sh