evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a stray conflict marker

Browse Source
This commit is contained in:
Mika Bostrom 2009-10-26 16:53:18 +02:00
parent 27fa27f370
commit 35b24fa002
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/HandHistoryConverter.py
View File

@ -1,8 +1,5 @@
#!/usr/bin/python
<<<<<<< HEAD:pyfpdb/HandHistoryConverter.py
# -*- coding: utf-8 -*-
=======
>>>>>>> 1efdd7fc68d3c9ce013f4d42730bece8075e2272:pyfpdb/HandHistoryConverter.py
#Copyright 2008 Carl Gherardi
#This program is free software: you can redistribute it and/or modify