Fix conflict

This commit is contained in:
/usr/bin/nano
2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions
-9
View File
@@ -1,9 +0,0 @@
version=pmwiki-2.2.75 ordered=1 urlencoded=1
agent=Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0
charset=UTF-8
ctime=1484936164
host=188.143.232.27
name=Profiles.RecentChanges
rev=3
text=* [[Profiles/Author]] . . . January 23, 2017, at 07:24 PM by [[~Deandra]]: [=oqiyEEsMU4DV=]%0a
time=1485188642