upgrade initiated at 1595917939

upgrade initiated at 1595917939
Fetching origin
Auto-merging utils.pl
CONFLICT (content): Merge conflict in utils.pl
Auto-merging update.pl
CONFLICT (add/add): Merge conflict in update.pl
Auto-merging sqlite.pl
CONFLICT (content): Merge conflict in sqlite.pl
Auto-merging pages.pl
CONFLICT (add/add): Merge conflict in pages.pl
Auto-merging index.pl
CONFLICT (content): Merge conflict in index.pl
Auto-merging generate.pl
CONFLICT (content): Merge conflict in generate.pl
Auto-merging doc/todo.txt
CONFLICT (add/add): Merge conflict in doc/todo.txt
Auto-merging doc/markdown.txt
CONFLICT (add/add): Merge conflict in doc/markdown.txt
Auto-merging doc/known.txt
CONFLICT (add/add): Merge conflict in doc/known.txt
Auto-merging doc/goals.txt
CONFLICT (add/add): Merge conflict in doc/goals.txt
Auto-merging doc/brainstorm.txt
CONFLICT (add/add): Merge conflict in doc/brainstorm.txt
Auto-merging default/template/vote2button.template
CONFLICT (add/add): Merge conflict in default/template/vote2button.template
Auto-merging default/template/php/utils.php.template
CONFLICT (add/add): Merge conflict in default/template/php/utils.php.template
Auto-merging default/template/php/upload.php.template
CONFLICT (add/add): Merge conflict in default/template/php/upload.php.template
Auto-merging default/template/php/route.php.template
CONFLICT (add/add): Merge conflict in default/template/php/route.php.template
Auto-merging default/template/php/post.php.template
CONFLICT (add/add): Merge conflict in default/template/php/post.php.template
Auto-merging default/template/maincontent.template
CONFLICT (add/add): Merge conflict in default/template/maincontent.template
Auto-merging default/template/js/translit.js.template
CONFLICT (add/add): Merge conflict in default/template/js/translit.js.template
Auto-merging default/template/js/settings.js.template
CONFLICT (add/add): Merge conflict in default/template/js/settings.js.template
Auto-merging default/template/js/profile.js.template
CONFLICT (add/add): Merge conflict in default/template/js/profile.js.template
Auto-merging default/template/js/fresh.js.template
CONFLICT (add/add): Merge conflict in default/template/js/fresh.js.template
Auto-merging default/template/item/item.template
CONFLICT (add/add): Merge conflict in default/template/item/item.template
Auto-merging default/template/htmlstart.template
CONFLICT (add/add): Merge conflict in default/template/htmlstart.template
Auto-merging default/template/form/settings.template
CONFLICT (add/add): Merge conflict in default/template/form/settings.template
Auto-merging default/template/access.template
CONFLICT (add/add): Merge conflict in default/template/access.template
Auto-merging default/string/en/page_intro/access
CONFLICT (add/add): Merge conflict in default/string/en/page_intro/access
Auto-merging default/list/menu_advanced
CONFLICT (add/add): Merge conflict in default/list/menu_advanced
Auto-merging clean.sh
CONFLICT (add/add): Merge conflict in clean.sh
Auto-merging build.pl
CONFLICT (add/add): Merge conflict in build.pl
Auto-merging access.pl
CONFLICT (content): Merge conflict in access.pl
Automatic merge failed; fix conflicts and then commit the result.
version no change
upgrade finished at 1595917955

; $authorLink; 88d4e3bb; reply(0); flag; approve;
Add Tags
flag;
Reply


Item Attributes
attribute value
File:/txt/88/d4/88d4e3bb0a8e7c79cd1aacd5d2f8226bbe18d29c.txt
Type:txt
MD5:fe2872c1c0418d34829f7ce7d6e69d4a
SHA1:88d4e3bb0a8e7c79cd1aacd5d2f8226bbe18d29c
Title:upgrade initiated at 1595917939
Tags
Skip to main content; Accessibility mode;
Read; Write; Upload; Help; Stats; Events; Tags; Index0; Settings; Profile; More
▲