From 610d0921387f243d1a7ea46fd90819f810b1009b Mon Sep 17 00:00:00 2001 From: ileler Date: Sun, 20 Dec 2020 19:16:03 +0800 Subject: [PATCH] Conflict resolution --- src/components/Links.svelte | 320 +++++++++++++++++++----------------- 1 file changed, 171 insertions(+), 149 deletions(-) diff --git a/src/components/Links.svelte b/src/components/Links.svelte index fe16c3b2..beea7152 100755 --- a/src/components/Links.svelte +++ b/src/components/Links.svelte @@ -1,178 +1,200 @@
- -
- + +
+

- + - + - - + + -
+