Phase 3.1: Add remaining local files

2026-02-05 16:04:20 +11:00
parent e3cae7bfbb 65c71b3d67
commit c4706f1779
26 changed files with 1780 additions and 1 deletions
--- a/frontend/src/api/axios.ts
+++ b/frontend/src/api/axios.ts
@@ -1,6 +1,10 @@
 import axios from 'axios';

+<<<<<<< HEAD
 export const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:8001';
+=======
+const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:8001';
+>>>>>>> 65c71b3d67d462fe9ecc01a1c2aa17e54b626fe2

 const api = axios.create({
  baseURL: API_BASE_URL,