Skip to content

Commit da4d070

Browse files
committed
back
1 parent ddb49c0 commit da4d070

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ db.json
44
*.log
55
node_modules/
66
public/
7-
<<<<<<< HEAD
8-
.deploy*/
9-
=======
107
.deploy*/
118
.bak
129
_config.yml
13-
14-
>>>>>>> fa372eb98a467f97dc6b239c1c4ab4544edd6647

0 commit comments

Comments
 (0)