Commit 0eb7e01eb711db1f7c3a465142b9fd882f9b1117
1 parent
52e10008
Exists in
remoteData
merge with master
Showing
1 changed file
with
1 additions
and
12 deletions
Show diff stats
php/classes/AmdaAction.php
| ... | ... | @@ -251,24 +251,13 @@ class AmdaAction |
| 251 | 251 | |
| 252 | 252 | if ($child->tagName == 'parameter') { |
| 253 | 253 | $isParameter = true; |
| 254 | -<<<<<<< HEAD | |
| 255 | - | |
| 256 | - if ($child->hasAttribute('units')) | |
| 257 | - $info = $child->getAttribute('units'); | |
| 258 | - else | |
| 259 | - $info=""; | |
| 260 | - | |
| 261 | - if ($child->hasAttribute('description')) | |
| 262 | - $info = $child->getAttribute('description')."<br/>".$info; | |
| 263 | - | |
| 264 | -======= | |
| 265 | 254 | if ($child->hasAttribute('TemplatedParameter')) |
| 266 | 255 | $needsArgs = true; |
| 267 | 256 | |
| 268 | 257 | if ($child->hasAttribute('PredefinedTemplatedParameter')) |
| 269 | 258 | $predefinedArgs = true; |
| 270 | 259 | |
| 271 | ->>>>>>> master | |
| 260 | + | |
| 272 | 261 | if ($child->parentNode->hasAttribute('dataStart')) { |
| 273 | 262 | $globalStart = $child->parentNode->getAttribute('dataStart'); |
| 274 | 263 | $globalStop = $child->parentNode->getAttribute('dataStop'); |
| ... | ... |