Skip to content
Snippets Groups Projects
Commit f081849b authored by Zoltan Mathe's avatar Zoltan Mathe
Browse files

v8r8p7 resolve conflicts

parents 314b5443 8bec3206
No related branches found
No related tags found
No related merge requests found
......@@ -50,6 +50,11 @@ use DIRAC v6r18p1
* Changed column order
* Moved RMS db to sqlalchemy
[v8r8p7]
use DIRAC v6r17p24
* Fix conf.py of documentation
[v8r8p6]
use DIRAC v6r17p23
......
......@@ -29,6 +29,13 @@ Releases
LcgVer = 2017-05-30
}
v8r8p7
{
Modules = LHCbDIRAC:v8r8p7, LHCbWebDIRAC:v4r3p3
Depends = DIRAC:v6r17p24
LcgVer = 2017-05-23
}
v8r8p6
{
Modules = LHCbDIRAC:v8r8p6, LHCbWebDIRAC:v4r3p3
......
......@@ -11,7 +11,9 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
import sys, os
import sys
import os
import datetime
sys.path.append(os.getcwd())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment