resolving merge conflicts

1 files changed, 0 insertions, 27 deletions

diff --git a/app_expo/services/api/api-config.ts b/app_expo/services/api/api-config.ts
deleted file mode 100644
index b939c0e..0000000
--- a/app_expo/services/api/api-config.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Use this import if you want to use "env.js" file
-// const { API_URL } = require("../../config/env")
-// Or just specify it directly like this:
-const API_URL = 'http://example.com'
-
-/**
- * The options used to configure the API.
- */
-export interface ApiConfig {
-  /**
-   * The URL of the api.
-   */
-  url: string
-
-  /**
-   * Milliseconds before we timeout the request.
-   */
-  timeout: number
-}
-
-/**
- * The default configuration for the app.
- */
-export const DEFAULT_API_CONFIG: ApiConfig = {
-  url: API_URL || 'https://jsonplaceholder.typicode.com',
-  timeout: 10000,
-}