index

tanuloi_nevsor/index.html

@@ -5,12 +5,20 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Tanulói névsor</title>
     <script defer src="nevsor.js"></script>
+<<<<<<< HEAD
+</head>
+<body>
+    <h1>Tanulói névsor</h1>
+    <div id="root">
+
+=======
      <script defer src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
 </head>
 <body>
     <h1 class="text-3xl font-bold text-center text-sky-600 bg-sky-200">Tanulói névsor</h1>
     <div class="flex flex-row flex-wrap items-center justify-center" id="root">
         
+>>>>>>> f042cd8f17ed8d3585187d1f98da52e1980de9be
     </div>
     
 </body>