Merge pull request #79 from meyerweb/main

Fixed a typo and cleaned up conflict detritus
bkardell · Oct 9, 2024 · 9db784f · 9db784f
2 parents 12f6d64 + fbf6b69
commit 9db784f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/templates/baseline.handlebars b/templates/baseline.handlebars
@@ -11,11 +11,7 @@
 <link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png">
 <link rel="manifest" href="/favicons/site.webmanifest">
 <link type="text/css" href="https://bcd-watch.igalia.com/styles.css" rel="stylesheet">
-<<<<<<< HEAD
 <title>BCD New Universal Implementations Report, {{reportDate}}</title>
-=======
-<title>BCD New Universal Implmentations Report, {{reportDate}}</title>
->>>>>>> d97fc2d (fix the wording on existing reports for 'baseline')
 </head>
 <body>
     <div class="header">

diff --git a/templates/weekly.handlebars b/templates/weekly.handlebars
@@ -115,7 +115,7 @@
       <summary>Show all {{ allImplementationsCt }} changes</summary>
       <div class="outline-container">
       <p class="info"><strong>Note:</strong> The following represent changes to BCD metadata keys
-        in the reported time period.  Keys are not implementations, and they don't represent commitments toward implementation, etc.  A new key occuring is perhaps a signal that some implementer was serious enough to add the key.  Many of the features that are 'removed' are usually just 'moved' or 'renamed', but we don't have great ways to highlight that.
+        in the reported time period.  Keys are not implementations, and they don't represent commitments toward implementation, etc.  A new key occurring is perhaps a signal that some implementer was serious enough to add the key.  Many of the features that are 'removed' are usually just 'moved' or 'renamed', but we don't have great ways to highlight that.
       </p>
       </div>