Merge branch 'main' of https://git.dianaband.info/doohoyi/expressive-distribusi into main

2021-01-31 20:31:28 +09:00 · 2021-01-31 20:31:28 +09:00 · 86de0ac6b1
commit 86de0ac6b1
parent f5e76c78cb d5de3bd80a
1 changed files with 3 additions and 0 deletions
--- a/styles/yoshi.css
+++ b/styles/yoshi.css
@ -165,7 +165,10 @@ a:hover {
  display: block;
  font-weight: 700;
  border: unset;
+<<<<<<< HEAD
  /* color: rgba(180, 64, 134, 0.5); */
+=======
+>>>>>>> d5de3bd80a2e71d61cf38a6399bd7b6e57719618
  color: rgba(37, 176, 118, 0.25);
 }