fix merge conflicts in single-file-example.html

balazsorban44 · web-flow · commit 72a5994b5fdd · 2020-10-31T23:20:41.000+01:00
diff --git a/static/html/single-file-example.html b/static/html/single-file-example.html
@@ -2,17 +2,10 @@
 <html>
   <head>
     <meta charset="UTF-8" />
-<<<<<<< HEAD
     <title>Helló világ</title>
-    <script src="https://unpkg.com/react@16/umd/react.development.js"></script>
-    <script src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
-    
-=======
-    <title>Hello World</title>
     <script src="https://unpkg.com/react@17/umd/react.development.js"></script>
     <script src="https://unpkg.com/react-dom@17/umd/react-dom.development.js"></script>
-
->>>>>>> 6682068641c16df6547b3fcdb7877e71bb0bebf9
+    
     <!-- Don't use this in production: -->
     <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
   </head>
