From c2807ad08036dd3a5fcecbb93b00b107510ddf25 Mon Sep 17 00:00:00 2001
From: Matteo Delucchi <37136726+matteodelucchi@users.noreply.github.com>
Date: Fri, 20 Mar 2020 17:27:33 +0100
Subject: [PATCH] fix merge conflict

---
 results/swissprot_aminoacid_distribution.Rmd | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/results/swissprot_aminoacid_distribution.Rmd b/results/swissprot_aminoacid_distribution.Rmd
index f678aec..8a24500 100644
--- a/results/swissprot_aminoacid_distribution.Rmd
+++ b/results/swissprot_aminoacid_distribution.Rmd
@@ -781,8 +781,5 @@ if( save) {
 ```{r correlation analysis: AA ratio in all Swissprot w/o TRs vs. disorder propensity}
 cor.test(df$aa_ratio_negsp, df$disorderpropensity, method = "spearman")
 print(paste("rho^2:", round(cor.test(df$aa_ratio_negsp, df$disorderpropensity, method = "spearman")$estimate[1]^2, 3)))
-<<<<<<< HEAD
 ```
-=======
-```
->>>>>>> 6a2ef1cde30da06bf38120820e066a7e7fe8152a
+