fix conflict

evolution-cms · Mar 2, 2018 · 97f7321 · 97f7321
1 parent 492d926
commit 97f7321
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/assets/cache/.htaccess b/assets/cache/.htaccess
diff --git a/assets/cache/updater/ht.access b/assets/cache/updater/ht.access
diff --git a/assets/cache/updater/index.html b/assets/cache/updater/index.html