Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug #478: unresolved conflicts appear again when Edit calculation case in Manual...
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_Object.sip
diff --git
a/src/HYDROPy/HYDROData_Object.sip
b/src/HYDROPy/HYDROData_Object.sip
index 399ce5b6287bcb90578cb0be1c1b8105eb9eb091..6077443ee6802e7f8ee470cf7244f8964927debe 100644
(file)
--- a/
src/HYDROPy/HYDROData_Object.sip
+++ b/
src/HYDROPy/HYDROData_Object.sip
@@
-24,7
+24,7
@@
#include <HYDROData_Object.h>
%End
#include <HYDROData_Object.h>
%End
-class HYDROData_Object : HYDROData_Entity /Abstract/
+class HYDROData_Object :
public
HYDROData_Entity /Abstract/
{
%TypeHeaderCode
#include <HYDROData_Object.h>
{
%TypeHeaderCode
#include <HYDROData_Object.h>