Skip to content

Commit

Permalink
fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
iblislin committed Oct 17, 2018
1 parent 5d1dcc7 commit 9262ce7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/combine.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function merge(ta1::TimeArray{T,N,D}, ta2::TimeArray{T,M,D}, method::Symbol = :i
elseif typeof(_meta(ta1)) <: AbstractString && typeof(_meta(ta2)) <: AbstractString && meta nothing
string(_meta(ta1), "_", _meta(ta2))
else
meta
meta
end

if method == :inner
Expand Down
2 changes: 1 addition & 1 deletion src/utilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function replace_dupes(cnames::Vector{Symbol})
if n == 1
cnames[d] = Symbol(cnames[d], "_$n")
else
s = string(cnames[d])
s = string(cnames[d])
cnames[d] = Symbol(s[1:length(s)-length(string(n))-1], "_$n")
end
end
Expand Down

0 comments on commit 9262ce7

Please sign in to comment.