Fix conf.py
This commit is contained in:
parent
e929433483
commit
22b0a1b368
@ -33,11 +33,8 @@ master_doc = 'index'
|
|||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'Lubuntu Manual'
|
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'
|
copyright = u'2016-2022, Lubuntu Team. This work is licensed under a Creative Commons Attribution 4.0 International License'
|
||||||
>>>>>>> stable
|
|
||||||
author = u'Lubuntu Team'
|
author = u'Lubuntu Team'
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
|
Loading…
x
Reference in New Issue
Block a user