]> git.ipfire.org Git - thirdparty/google/fonts.git/commitdiff
Merge branch 'gftools_packager_ofl_wittgenstein' of github.com:emmamarichal/fonts...
authorEmma Marichal <bonjour@emmamarichal.fr>
Wed, 5 Jun 2024 14:04:23 +0000 (16:04 +0200)
committerEmma Marichal <bonjour@emmamarichal.fr>
Wed, 5 Jun 2024 14:04:23 +0000 (16:04 +0200)
# Conflicts:
# ofl/wittgenstein/METADATA.pb
# ofl/wittgenstein/Wittgenstein-Italic[wght].ttf
# ofl/wittgenstein/Wittgenstein[wght].ttf

1  2 
ofl/wittgenstein/METADATA.pb

index 545e94ca8484e7fb8de9c72860a2c27737803fef,759f9e7339ced767b6835c2bcb06101393a6ae3a..93bf73df9d5f425ed65f82f25d5fb0eac5745f1d
@@@ -31,7 -31,7 +31,11 @@@ axes 
  }
  source {
    repository_url: "https://github.com/jrgdrs/Wittgenstein"
++<<<<<<< HEAD
 +  commit: "56c1cf1b4a9f5127d4621f1e167f6415b0a284e9"
++=======
+   commit: "40616b6ad7adff0e242fba10c0b88c2c8c84b3fc"
++>>>>>>> ce3aa208824d1d4fa51c4d6c01e9cf2ce7575b24
    files {
      source_file: "OFL.txt"
      dest_file: "OFL.txt"