From 26965b5126822b5b886ba8798a9919153ffdee37 Mon Sep 17 00:00:00 2001 From: steffen123 Date: Sun, 4 Jul 2010 03:05:16 +0200 Subject: [PATCH] some cleanups: - updated copyright notices - added copyright notices that were missing - changed python to python2 - added gpl-2/3 license texts - removed THANKS.txt file as the wiki version is more up to date - removed empty fpdb_db.py - added GPL2 to debian license file --- run_fpdb.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/run_fpdb.py b/run_fpdb.py index 755791b2..231fedf9 100755 --- a/run_fpdb.py +++ b/run_fpdb.py @@ -1,9 +1,5 @@ -<<<<<<< HEAD -#!/usr/bin/python -======= #!/usr/bin/python2 # -*- coding: utf-8 -*- ->>>>>>> 3b24fd1... some cleanups: #Copyright 2008-2010 Carl Gherardi #This program is free software: you can redistribute it and/or modify