[ci skip] remove umerged conflict markers in RELEASE.txt
treed1f3bf2c12b48d1418a5fed83450ddcedd19b6d8
-rw-r--r-- 3665 .appveyor.yml
drwxr-xr-x - .appveyor
-rw-r--r-- 1090 .codecov.yml
drwxr-xr-x - .coverage_templates
-rw-r--r-- 432 .flake8
-rw-r--r-- 83 .git-blame-ignore-revs
-rw-r--r-- 185 .gitattributes
drwxr-xr-x - .github
-rw-r--r-- 507 .gitignore
-rw-r--r-- 2573 .travis.yml
drwxr-xr-x - .travis
-rw-r--r-- 307529 CHANGES.txt
-rw-r--r-- 22561 CONTRIBUTING.rst
-rw-r--r-- 1084 LICENSE
-rw-r--r-- 1251 LICENSE-local
-rw-r--r-- 155 MANIFEST.in
-rwxr-xr-x 21829 README-SF.rst
-rw-r--r-- 8011 README-local
-rwxr-xr-x 7269 README-package.rst
-rwxr-xr-x 11314 README.rst
-rw-r--r-- 9602 RELEASE.txt
-rwxr-xr-x 2586 ReleaseConfig
drwxr-xr-x - SCons
-rw-r--r-- 7303 SConstruct
drwxr-xr-x - bench
drwxr-xr-x - bin
-rwxr-xr-x 7844 bootstrap.py
drwxr-xr-x - doc
-rw-r--r-- 6590 lgtm.yml
drwxr-xr-x - packaging
-rw-r--r-- 268 pyproject.toml
-rw-r--r-- 433 requirements-dev.txt
-rw-r--r-- 375 requirements-pkg.txt
-rw-r--r-- 36 requirements.txt
-rwxr-xr-x 31991 runtest.py
drwxr-xr-x - scripts
-rw-r--r-- 2073 setup.cfg
-rw-r--r-- 1212 setup.py
-rw-r--r-- 96 shippable.yml
drwxr-xr-x - site_scons
drwxr-xr-x - src
drwxr-xr-x - template
drwxr-xr-x - test
drwxr-xr-x - testing
drwxr-xr-x - timings