Skip to content

Commit 4443f3c

Browse files
resolve merge
2 parents aea5676 + f3e5a0e commit 4443f3c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

R/as.data.table.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ as.data.table.list = function(x,
171171
xi = x[[i]] = c(xi)
172172
} else {
173173
xi = x[[i]] = as.data.table(xi, keep.rownames=FALSE) # we will never allow a matrix to be a column; always unpack the columns
174+
xi = x[[i]] = as.data.table(xi, keep.rownames=FALSE) # we will never allow a matrix to be a column; always unpack the columns
174175
}
175176
}
176177
# else avoid dispatching to as.data.table.data.table (which exists and copies)
@@ -227,7 +228,7 @@ as.data.table.list = function(x,
227228
if (check.names) vnames = make.names(vnames, unique=TRUE)
228229

229230
# Add rownames column when vector names were found
230-
if(!is.null(vector_rownames)){
231+
if (!is.null(vector_rownames)) {
231232
rn_name = if (is.character(keep.rownames)) keep.rownames[1L] else "rn"
232233
ans = c(list(recycle(vector_rownames, nrow)), ans)
233234
vnames = c(rn_name, vnames)

0 commit comments

Comments
 (0)