Albeiro-Dev
10/26/2018 - 6:53 PM

git error

your local changes override by merge

txt
content_copyfile_download
git reset --hard
git pull