From 85313df79b9b68e6f5588f588c1bdd077672dd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cin=C3=A9-club=20Ulm?= Date: Sat, 23 Mar 2019 09:58:55 +0000 Subject: [PATCH] resolved merge --- .gitignore | 1 - baseFilms.db | Bin 81920 -> 81920 bytes cineclubBlogSQ.py | 1 - 3 files changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c155f6..939836c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ *.png *pycache* *.db - diff --git a/baseFilms.db b/baseFilms.db index aa2c0bd7ec9ed237deead71cf8e103b17523f576..7b940eafd725ec3b567530ee601150da4d7e6ea6 100644 GIT binary patch delta 26 icmZo@U~On%ogmG4Zla7c>p2G9k2@Muwx%%7u?GNvunG78 delta 26 icmZo@U~On%ogmG4cA|_k>sbapnGKC8TT>Y4*aHA~;0YQ4 diff --git a/cineclubBlogSQ.py b/cineclubBlogSQ.py index e5b5e2d..0495337 100644 --- a/cineclubBlogSQ.py +++ b/cineclubBlogSQ.py @@ -244,7 +244,6 @@ class filmSQ(): res += self.synopsis return res - def mail(self): res = ' \n \t \n \n \n \t \t' res += ' \n \t \t'