resolvendo conflito

Univesp-Computacao · Jul 26, 2022 · 1a70405 · 1a70405
2 parents 159d16e + b99449e
commit 1a70405
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 374 deletions.
diff --git a/css/newstyle.css b/css/newstyle.css
diff --git a/css/style.css b/css/style.css