From 6c80b4e89707a64a2ebce51049a673ca5f6dc6de Mon Sep 17 00:00:00 2001
From: Emma Marichal <bonjour@emmamarichal.fr>
Date: Wed, 5 Jun 2024 16:14:06 +0200
Subject: [PATCH] Fix conflicts

---
 ofl/wittgenstein/DESCRIPTION.en_us.html     | 12 ------------
 ofl/wittgenstein/METADATA.pb                |  4 ----
 ofl/wittgenstein/article/ARTICLE.en_us.html |  9 ---------
 3 files changed, 25 deletions(-)
 delete mode 100644 ofl/wittgenstein/DESCRIPTION.en_us.html

diff --git a/ofl/wittgenstein/DESCRIPTION.en_us.html b/ofl/wittgenstein/DESCRIPTION.en_us.html
deleted file mode 100644
index 29962e0b95..0000000000
--- a/ofl/wittgenstein/DESCRIPTION.en_us.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<p>
- The font interprets the serifs with clear, sharp forms.
- Based on the quote from Ludwig Wittgenstein that what can be said can be said clearly, it bears his name.
- The style consists of a normal and a bold version, which can be expanded over time.
- <p>
-  To contribute, see
-  <a href="https://github.com/jrgdrs/Wittgenstein">
-   github.com/jrgdrs/Wittgenstein
-  </a>
-  .
- </p>
-</p>
diff --git a/ofl/wittgenstein/METADATA.pb b/ofl/wittgenstein/METADATA.pb
index 93bf73df9d..545e94ca84 100644
--- a/ofl/wittgenstein/METADATA.pb
+++ b/ofl/wittgenstein/METADATA.pb
@@ -31,11 +31,7 @@ axes {
 }
 source {
   repository_url: "https://github.com/jrgdrs/Wittgenstein"
-<<<<<<< HEAD
   commit: "56c1cf1b4a9f5127d4621f1e167f6415b0a284e9"
-=======
-  commit: "40616b6ad7adff0e242fba10c0b88c2c8c84b3fc"
->>>>>>> ce3aa208824d1d4fa51c4d6c01e9cf2ce7575b24
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
diff --git a/ofl/wittgenstein/article/ARTICLE.en_us.html b/ofl/wittgenstein/article/ARTICLE.en_us.html
index 0afa66f4ad..7b48ac23c9 100644
--- a/ofl/wittgenstein/article/ARTICLE.en_us.html
+++ b/ofl/wittgenstein/article/ARTICLE.en_us.html
@@ -54,12 +54,3 @@ Wittgenstein is the ideal choice for editorial layouts, corporate branding, or a
 <img src="about9.png"/>
 
 <p>To contribute, see <a href="https://github.com/jrgdrs/Wittgenstein"> github.com/jrgdrs/Wittgenstein</a>.</p>
-
-
-
-
-
-
-
-
-
-- 
2.47.2