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

---
 results/swissprot_aminoacid_distribution.Rmd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/results/swissprot_aminoacid_distribution.Rmd b/results/swissprot_aminoacid_distribution.Rmd
index 8a24500..f39c406 100644
--- a/results/swissprot_aminoacid_distribution.Rmd
+++ b/results/swissprot_aminoacid_distribution.Rmd
@@ -782,4 +782,3 @@ if( save) {
 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)))
 ```
-