Skip to content
Snippets Groups Projects
Commit 9efd7e5d authored by arsenij.ustjanzew's avatar arsenij.ustjanzew
Browse files

resolved merge conflict with branch "filename_fix" 

Merge branch 'filename_fix' into vignette

# Conflicts:
#	R/assemble.R
#	R/components.R
#	man/add-component.Rd
#	man/i2dashboard-methods.Rd
parents 2764ddd3 4dbd5922
No related branches found
No related tags found
1 merge request!8Vignette: i2dash introduction
Pipeline #114559 failed
Stage: build
Stage: check
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment