pulled yoga2

2019-05-03 02:20:07 +00:00
parent 89b812c0dd 2f6f026bc6
commit ffc562affa
27 changed files with 566 additions and 136 deletions
@@ -4,7 +4,11 @@ then
  status=`cmus-remote -Q | grep status | awk '{print $2}'`
  if [ $status == "paused" ]
  then
+<<<<<<< HEAD
    status="ç"
+=======
+    status="→"
+>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
  else
    status="æ"
  fi