nothing

frontend/src/pages/board.tsx

@@ -5,13 +5,9 @@ function range(start:number, end:number) {
 }
 
 export default function BoardPage() {
-<<<<<<< HEAD
-    const imgs = range(1,8); //[1,2,3,4,5,6,7]
-=======
     const ords = range(1,8); //[1,2,3,4,5,6,7];
     const [count, setCount] = useState(0);
 
->>>>>>> a7056a6986765dfc1269fbf0543c54a1e14a9ac7
     return (
         <div className="flex flex-col items-center">
             <div className="flex flex-col items-center mt-6">