冲突处理
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -4,8 +4,10 @@ databases/*
|
||||
public/*.sql
|
||||
public/*.db
|
||||
|
||||
# 博客文档
|
||||
|
||||
##### 博客文档
|
||||
# 图片
|
||||
src/image/*
|
||||
public/image/*
|
||||
|
||||
# 管理员面板
|
||||
public/blog/master/passwd
|
||||
@@ -18,5 +20,4 @@ public/message/static/src/video/*
|
||||
# 临时区
|
||||
public/blog/md/*
|
||||
public/blog/md0/*
|
||||
|
||||
# 临时区
|
||||
Reference in New Issue
Block a user