fix(index): fix conflict

mission-apprentissage · Oct 16, 2024 · c3736dc · c3736dc
1 parent 935b982
commit c3736dc
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ui/public/index.html b/ui/public/index.html
@@ -2,19 +2,11 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-<<<<<<< HEAD
-    <link rel="apple-touch-icon" href="/dsfr/favicon/apple-touch-icon.png?v=1.12.1" />
-    <link rel="icon" href="/dsfr/favicon/favicon.svg?v=1.12.1" type="image/svg+xml" />
-    <link rel="shortcut icon" href="/dsfr/favicon/favicon.ico?v=1.12.1" type="image/x-icon" />
-    <link rel="manifest" href="/dsfr/favicon/manifest.webmanifest?v=1.12.1" crossorigin="use-credentials" />
-    <link rel="stylesheet" href="/dsfr/utility/icons/icons.min.css?hash=cd54ee22" />
-=======
     <link rel="apple-touch-icon" href="/dsfr/favicon/apple-touch-icon.png" />
     <link rel="icon" href="/dsfr/favicon/favicon.svg" type="image/svg+xml" />
     <link rel="shortcut icon" href="/dsfr/favicon/favicon.ico" type="image/x-icon" />
     <link rel="manifest" href="/dsfr/favicon/manifest.webmanifest" crossorigin="use-credentials" />
     <link rel="stylesheet" href="/dsfr/utility/icons/icons.min.css?hash=c6c054f5" />
->>>>>>> server/add-field-campagne-export
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta