From 5356c056546d836a6c2935702cacbb3ed2124a26 Mon Sep 17 00:00:00 2001
From: Tomas Horsky <tomashorsky@kaist.ac.kr>
Date: Tue, 9 Jun 2026 16:54:31 +0900
Subject: [PATCH] finished merging

---
 src/App.svelte          |  4 ++--
 src/lib/Timeline.svelte | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 src/lib/Timeline.svelte

diff --git a/src/App.svelte b/src/App.svelte
index 5287ced..1fde5c4 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -2,7 +2,7 @@
   import Layout from './lib/layout/Layout.svelte';
   import WorldMap from './lib/world-map/WorldMap.svelte';
   import StatsPanel from './lib/world-map/StatsPanel.svelte';
-  import Timeline from './lib/Timeline.svelte';
+  import TimelineView from './lib/TimelineView.svelte';
 
   let screen = $state('worldmap');
 
@@ -20,7 +20,7 @@
       <StatsPanel />
     </div>
   {:else}
-    <Timeline />
+    <TimelineView />
   {/if}
 </Layout>
 
diff --git a/src/lib/Timeline.svelte b/src/lib/Timeline.svelte
deleted file mode 100644
index 40386ff..0000000
--- a/src/lib/Timeline.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="placeholder">
-  <p>Timeline — coming soon</p>
-</div>
-
-<style>
-  .placeholder {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font: 16px/1.4 sans-serif;
-    color: #888;
-  }
-</style>