aboutsummaryrefslogtreecommitdiffstats
path: root/docs/conf.py
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-06 20:52:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-06 20:52:49 +0000
commit1d4a3be615bde2ff311fece1ab3225cb0a0cb65d (patch)
tree76d9e0cabe45c1ed6d9ea87a5deb9c75c4345653 /docs/conf.py
parent3397754200ec130e8c0ca9e25d47dd2db6350493 (diff)
parent780068d4eec8e880d55d58eb348bee2d71580e83 (diff)
downloadplatform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.tar.gz
platform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.tar.bz2
platform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.zip
Merge '5f62213e684dbea03b5a2bb732405a03ccc1a815' into master am: 5dfd96a0b3 am: 780068d4ee
Change-Id: Ib5aa59c512fa91a23f84e24cc87b301d27e0e4e8
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py
index b267de0e8..a100241c1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,9 +15,6 @@ import os
project = 'Trusted Firmware-A'
-version = '2.1'
-release = version # We don't need these to be distinct
-
# -- General configuration ---------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be