From 22b0a1b3681c38871343548348262ef602db5099 Mon Sep 17 00:00:00 2001 From: Lyn Perrine Date: Sat, 26 Nov 2022 21:34:21 -0800 Subject: [PATCH] Fix conf.py --- source/conf.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/source/conf.py b/source/conf.py index 5af2b034..a24040c9 100644 --- a/source/conf.py +++ b/source/conf.py @@ -33,11 +33,8 @@ master_doc = 'index' # General information about the project. project = u'Lubuntu Manual' -<<<<<<< HEAD -copyright = u'2016-2020, Lubuntu Team. This work is licensed under a Creative Commons Attribution 4.0 International License' -======= copyright = u'2016-2022, Lubuntu Team. This work is licensed under a Creative Commons Attribution 4.0 International License' ->>>>>>> stable + author = u'Lubuntu Team' # The version info for the project you're documenting, acts as replacement for