Commit 700281e1 authored by aditya.bhagwat's avatar aditya.bhagwat
Browse files

Fix merge conflict

Merge branch 'master' of git.bioconductor.org:packages/multicrispr

# Conflicts:
#	DESCRIPTION
parents c7c1ee0e c0454251
Pipeline #154356 passed with stages
in 24 seconds