From ddb12bc811ee6d3e89959b422de9fd33cb87952c Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Mon, 14 Dec 2015 14:33:07 +0000
Subject: [PATCH] * Fixing merge error in NPS
---
NPSimulation/Core/MaterialManager.cc | 4 ----
1 file changed, 4 deletions(-)
diff --git a/NPSimulation/Core/MaterialManager.cc b/NPSimulation/Core/MaterialManager.cc
index e6e6cccfa..22182ce45 100644
--- a/NPSimulation/Core/MaterialManager.cc
+++ b/NPSimulation/Core/MaterialManager.cc
@@ -233,10 +233,6 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name){
material->AddElement(GetElementFromLibrary("Si"),1);
// Adding Optical property:
-<<<<<<< HEAD
- //int NumberOfPoints = 10;
-=======
->>>>>>> a9afff128fb0fb6b1263b1be5e6132770d9801d3
double* energy_r = new double[2];
double* rindex = new double[2];
double* absorption= new double[2];
--
GitLab