# Pastebin IDxNFn26
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
	modified:   config.py.example
	modified:   dataset_eval/gaia_wrapper.py
	modified:   db/data.py
	modified:   db/dataset_eval.py
	modified:   db/test/test_dataset_eval.py
	modified:   hl_extractor/hl_calc.py
	new file:   hl_extractor/test/__init__.py
	new file:   hl_extractor/test/test_data/known_file
	new file:   hl_extractor/test/test_hl_calc.py
	modified:   requirements.txt
	modified:   webserver/forms.py
	modified:   webserver/templates/datasets/evaluate.html
	new file:   webserver/test/test_forms.py
	modified:   webserver/views/api/v1/core.py
	modified:   webserver/views/datasets.py
	modified:   webserver/views/test/test_datasets.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dataset_eval/evaluate.py