Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge errors post 8.3.0
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MEDCouplingAMRAttribute.hxx
diff --git
a/src/MEDCoupling/MEDCouplingAMRAttribute.hxx
b/src/MEDCoupling/MEDCouplingAMRAttribute.hxx
index 389942cf2d1e7734f5f522eb3862a139abe789da..e8565077c281ccc23970777c36e3da70fd29f328 100644
(file)
--- a/
src/MEDCoupling/MEDCouplingAMRAttribute.hxx
+++ b/
src/MEDCoupling/MEDCouplingAMRAttribute.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public