From 35b24fa00225d143152c36d9523e66670639fab2 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Mon, 26 Oct 2009 16:53:18 +0200 Subject: [PATCH] Remove a stray conflict marker --- pyfpdb/HandHistoryConverter.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 7e10e66a..0642d845 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -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