Skip to content
Permalink
Browse files

Merge branch 'feature/merge_speech_and_person_recognition' of https:/…

…/github.com/RoboCupAtHome/RuleBook into feature/merge_speech_and_person_recognition

Fixed .gitattributes issue
Conflicts:
	Rulebook.tex
	scoresheets/SpeechRecognition.tex
	tests/SpeechRecognition.tex
  • Loading branch information...
kyordhel committed Jan 8, 2017
2 parents ede4635 + e3a8b53 commit 42367deb9571ca6a37f93c7b91f7a8f5fd3ddf7f
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitattributes
@@ -1,4 +1,4 @@
* text=auto
#* text=auto
*.tex diff=tex
*.jpg binary
*.png binary

0 comments on commit 42367de

Please sign in to comment.
You can’t perform that action at this time.