Skip to content

Commit f60d710

Browse files
committed
merge conflicts resolved
1 parent 28ceaee commit f60d710

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

+nix/Block.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
'Block::openMultiTag', id_or_name, @nix.MultiTag);
156156
end;
157157

158-
%-- creating a multitag requires an already existing data array
158+
%-- Creating a multitag requires an already existing data array
159159
function multitag = create_multi_tag(obj, name, type, add_data_array)
160160
if(strcmp(class(add_data_array), 'nix.DataArray'))
161161
addID = add_data_array.id;

+nix/Section.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,5 @@
130130
end
131131
end;
132132

133-
end
133+
end;
134134
end

0 commit comments

Comments
 (0)