Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
Xdmf
Commits
0b37c6e9
Commit
0b37c6e9
authored
Apr 30, 2013
by
Andrew J. Burns (Cont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing improper merge with XdmfFortran header
parent
5006a190
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
utils/XdmfFortran.hpp
utils/XdmfFortran.hpp
+0
-6
No files found.
utils/XdmfFortran.hpp
View file @
0b37c6e9
...
...
@@ -542,16 +542,10 @@ public:
const
unsigned
int
numValues
,
const
int
arrayType
,
const
void
*
const
connectivityValues
,
<<<<<<<
HEAD
const
int
numNodes
);
=======
const
int
polyNodesPerElement
=
0
);
>>>>>>>
6748
b23947ebc47742c96d7e3a56242511c67d73
/**
* Returns the number of grid collections currently
* contained in the domain
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment