chore: resolve conflicts

Author: idleberg

README.md

@@ -20,8 +20,4 @@ import versions from '@nsis/release-data/versions.json' with { type: 'json' };
 
 ## License
 
-<<<<<<< HEAD
 [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/)
-=======
-This work is licensed under the MIT License.
->>>>>>> ac9923734529d463c70cbee2a6d7d6aaea69e8ef

docs/index.html

@@ -35,14 +35,11 @@ <h2>Endpoints</h2>
       <li><a href="versions.schema.json">versions.schema.json</a> — JSON Schema</li>
     </ul>
 
-<<<<<<< HEAD
     <h2>Usage</h2>
     <pre><code>const res = await fetch('https://nsis-dev.github.io/data/versions.json');
         const dataset = await res.json();
         const entry = dataset.versions['3.12'];</code></pre>
 
-=======
->>>>>>> ac9923734529d463c70cbee2a6d7d6aaea69e8ef
     <h2>Source</h2>
     <p>
       <a href="https://github.com/NSIS-Dev/release-data">github.com/NSIS-Dev/release-data</a>