Merge pull request #17962 from edx/jmbowman/fix_github_txt

Remove merge conflict cruft from github.txt

requirements/edx/github.txt

-<<<<<<< HEAD
-# DON'T JUST ADD NEW DEPENDENCIES!!!
-#
-# If you open a pull request that adds a new dependency, you should notify:
-#   * @edx/ospr - to check licensing
-#   * @edx/devops - to check system requirements
-#
-# Do *NOT* install Python packages from GitHub unless it's absolutely necessary!
-# "I don't have time to add automatic Travis upload to PyPI." is *not* an
-# acceptable excuse. Non-wheel module installations slow down the dev/building process.
-# Travis/PyPI instructions are here:
-# https://openedx.atlassian.net/wiki/spaces/OpenOPS/pages/41911049/Publishing+a+Package+to+PyPI+using+Travis
-#
-# A correct GitHub reference looks like this:
-#
-#   git+https://github.com/OWNER/REPO-NAME.git@TAG-OR-SHA#egg=DIST-NAME==VERSION
-#
-# For example:
-#
-#   git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2
-#
-# where:
-#
-#   OWNER = edx
-#   REPO-NAME = edx-lint
-#   TAG-OR-SHA = v0.3.2
-#   DIST-NAME = edx_lint
-#   VERSION = 0.3.2
-#
-#
-# Rules to follow (even though many URLs here don't follow them!):
-#
-#   * Don't leave out any of these pieces.
-#
-#   * Don't use -e
-#
-#   * TAG-OR-SHA is the specific commit to install.  It must be a git tag,
-#     or a git SHA commit hash.  Don't use branch names here.  If OWNER is
-#     not an edX organization, then it must be a SHA.  If you use a SHA,
-#     please make sure there is a tag associated with it, so the commit can't
-#     be lost during rebase.
-#
-#   * DIST-NAME is the distribution name, the same name you'd use in a
-#     "pip install" command.  It might be different than REPO-NAME. It must
-#     be the same as the `name="DIST-NAME"` value in the repo's setup.py.
-#
-#   * VERSION might not be the same as TAG-OR-SHA, but if the tag names the
-#     version, please make it match the VERSION, but with a "v" prefix.
-#     VERSION must be the same as the `version="VERSION"` value in the repo's
-#     setup.py.  An alternative is to use 0.0 as VERSION: this forces pip to
-#     re-install the package each time, and can be useful when working with two
-#     repos before picking a version number. Don't use 0.0 on master, only for
-#     tight-loop work in progress.
-
-
-# Python libraries to install directly from github
-
-# Third-party:
-git+https://github.com/jazzband/django-pipeline.git@d068a019169c9de5ee20ece041a6dea236422852#egg=django-pipeline==1.5.3
--e git+https://github.com/edx/django-wiki.git@v0.0.17#egg=django-wiki
-git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1
-git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
--e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
--e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
--e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-git+https://github.com/mitodl/django-cas.git@afac57bc523f145ae826f4ed3d4fa8b2c86c5364#egg=django-cas==2.1.1
--e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
-
-# The officially released version of django-debug-toolbar-mongo doesn't support DJDT 1.x. This commit does.
-git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808#egg=django-debug-toolbar-mongo==0.1.10
-
-# Forked to get Django 1.10+ compat that is in origin BitBucket repo, without an official build.
-# This can go away when we update auth to not use django-rest-framework-oauth
-git+https://github.com/edx/django-oauth-plus.git@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
-
-# NOTE (CCB): This must remain. There is one commit on the upstream repo that has not been released to PyPI.
-git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
-
-# Used for testing
-git+https://github.com/edx/lettuce.git@31b0dfd865766243e9b563ec65fae9122edf7975#egg=lettuce==0.2.23+edx.1
-
-# Why a DRF fork? See: https://openedx.atlassian.net/browse/PLAT-1581
-git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
-
-# Why a drf-oauth fork? To add Django 1.11 compatibility to the abandoned repo.
-# This dependency will be removed by this work: https://openedx.atlassian.net/browse/PLAT-1660
-git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
-
-# Why a django-celery fork? To add Django 1.11 compatibility to the abandoned repo.
-# This dependency will be removed by the Celery 4 upgrade: https://openedx.atlassian.net/browse/PLAT-1684
-git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f37e6b0#egg=django-celery==3.2.1+edx.2
-
-# Our libraries:
--e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail==0.0
--e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
-git+https://github.com/edx/edx-ora2.git@2.1.15#egg=ora2==2.1.15
-git+https://github.com/edx/RecommenderXBlock.git@1.3#egg=recommender-xblock==1.3
-git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
--e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
--e git+https://github.com/edx/DoneXBlock.git@01a14f3bd80ae47dd08cdbbe2f88f3eb88d00fba#egg=done-xblock
-git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5
--e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
-git+https://github.com/edx/xblock-lti-consumer.git@v1.1.7#egg=lti_consumer-xblock==1.1.7
-
-# Third Party XBlocks
-
-git+https://github.com/mitodl/edx-sga.git@6b2f7aa2a18206023c8407e2c46f86d4b4c3ac96#egg=edx-sga==0.8.0
-git+https://github.com/open-craft/xblock-poll@7ba819b968fe8faddb78bb22e1fe7637005eb414#egg=xblock-poll==1.2.7
-git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@2.1.5#egg=xblock-drag-and-drop-v2==2.1.5
-=======
 # Placeholder for code which hasn't yet been updated to no longer use this file.
 # The requirements which were here have been moved to github.in, and are now
 # incorporated into the appropriate full requirements files (base.txt,
 # testing.txt, etc.)
->>>>>>> PLAT-2060 Use pip-tools to manage requirements files (take 2)