Merge branch 'master' of github.com:JCSMR-Tremethick-Lab/MCF10APromoterAnalysis

Conflicts:
	R/PublicationPlots/PromoterCapSeq_parallel_plot_Figure1.R
	R/PublicationPlots/PromoterCapSeq_parallel_plot_Figure2.R

Author: Sebastian Kurscheid

R/PublicationPlots/PromoterCapSeq_parallel_plot_Figure1.R

@@ -1,10 +1,8 @@
 library(ggplot2)
-
 # just to make sure that no remnants of previous plot remain
 # Figure S1 (supplement to Figure 1)
 rm(list = ls())
 ## local functions
-
 dataDir <- "/home/sebastian/Data/Collaborations/FSU/PromoterSeqCap/sortingTSVS for Tremethick paper /Figure 1/"
 l1 <- lapply(list.files(path = dataDir, pattern=".tsv"), function(x){
   dt <- data.table::fread(paste(dataDir, x, sep = "/"))

R/PublicationPlots/PromoterCapSeq_parallel_plot_Figure2.R

@@ -1,4 +1,5 @@
 ## load libraries
+<<<<<<< HEAD
 library(ggparallel)
 library(alluvial)
 library(tidyverse)