Skip to content
Snippets Groups Projects
Commit 9d99c8e3 authored by Simon Rose's avatar Simon Rose
Browse files

Fixed silly merge error

parent 5e93835b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
App/tools/driver.makefile
+ 1
− 3
View file @ 9d99c8e3
...@@ -1121,9 +1121,7 @@ endif # EPICSVERSION defined ...@@ -1121,9 +1121,7 @@ endif # EPICSVERSION defined
## Thursday, March 7 00:11:50 CET 2019 : Add E3_SITEMODS_PATH, E3_SITEAPPS_PATH in the dep file generation. ## Thursday, March 7 00:11:50 CET 2019 : Add E3_SITEMODS_PATH, E3_SITEAPPS_PATH in the dep file generation.
## ##
## Monday, September 9 15:25:53 CEST 2019 : Revert E3_SITEMODS_PATH from E3_SITELIBS_PATH in the snc path ## Monday, September 9 15:25:53 CEST 2019 : Revert E3_SITEMODS_PATH from E3_SITELIBS_PATH in the snc path
<<<<<<< HEAD
=======
## ##
## Tuesday, June 30 2020 : Combine NFS E3 driver.makefile with conda version ## Tuesday, June 30 2020 : Combine NFS E3 driver.makefile with conda version
## ##
## Friday, July 3 2020 : Force all module names to be lowercase, to allow consistency between conda/ ## Friday, July 3 2020 : Force all module names to be lowercase, to allow consistency between conda/nfs startup scripts.
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment