fix: merge conflict
This commit is contained in:
parent
e3dc5c9516
commit
cd93129ba3
@ -36,15 +36,14 @@ $db->close();
|
||||
|
||||
?>
|
||||
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>login</title>
|
||||
<link rel="stylesheet" href="/src/css/global.css">
|
||||
<link rel="stylesheet" href="/src/css/style.css">
|
||||
<link rel="stylesheet" href="/css/global.css">
|
||||
<link rel="stylesheet" href="/css/style.css?v=2">
|
||||
</head>
|
||||
<body>
|
||||
<div class="container-login">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user