Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
aishenreemo committed Aug 6, 2023
2 parents 63d2b76 + a7289c0 commit e89a00f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions packages/vanilla-todo/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ li > .delete:hover {
color: #CF2323;
}


#completed-tasks label {
text-decoration: line-through;
color: #888;
Expand All @@ -113,5 +112,5 @@ ul li.editMode input[type="text"] {
}

ul li.editMode label {
display: none;
display: none;
}
2 changes: 1 addition & 1 deletion packages/vanilla-todo/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<title>Todo App</title>
<link
Expand Down

0 comments on commit e89a00f

Please sign in to comment.