Skip to content
Snippets Groups Projects
Commit de25ef81 authored by ojs1g14's avatar ojs1g14
Browse files

Merge branch 'master' of https://git.soton.ac.uk/js22g12/AmpScan

parents 9a903ff3 f0464f72
No related branches found
No related tags found
No related merge requests found
Pipeline #224 passed
...@@ -22,7 +22,7 @@ sys.path.insert(0, os.path.abspath('.')) ...@@ -22,7 +22,7 @@ sys.path.insert(0, os.path.abspath('.'))
project = 'AmpScan' project = 'AmpScan'
copyright = '2018, Joshua Steer' copyright = '2018, Joshua Steer'
author = 'Joshua Steer' author = 'Oliver Stocks'
# The short X.Y version # The short X.Y version
version = '' version = ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment