From d561771f2084f8ccb48142a7974bc63b0fab698b Mon Sep 17 00:00:00 2001
From: Daniel Falster <daniel.falster@mq.edu.au>
Date: Thu, 12 Sep 2013 16:19:22 +1000
Subject: [PATCH] Remove merge conflict
---
R/format.data/Spain.R | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/R/format.data/Spain.R b/R/format.data/Spain.R
index ed58774..77e752e 100644
--- a/R/format.data/Spain.R
+++ b/R/format.data/Spain.R
@@ -5,11 +5,7 @@ rm(list = ls())
source("format.fun.R")
library(reshape)
-<<<<<<< HEAD
dir.create("../../output/process/Spain", recursive=TRUE,showWarnings=FALSE)
-=======
-dir.create("../../output/process/Spain", recursive=TRUE, showWarnings = FALSE)
->>>>>>> Makefile for data processing
######################### READ DATA read individuals tree data
data.spain <- read.table("../../data/raw/Spain/Tree_data_SFI_aug13_alldata.txt",
@@ -25,12 +21,7 @@ res.quant.boot <- t(sapply(levels(factor(data.spain[["SP_code"]])), FUN = f.quan
data.max.height <- data.frame(sp = rownames(res.quant.boot), Max.height.mean = res.quant.boot[,
1], Max.height.sd = res.quant.boot[, 2], Max.height.nobs = res.quant.boot[, 3], stringsAsFactors =FALSE)
rm(res.quant.boot)
-<<<<<<< HEAD
-write.csv(data.max.height, file = "../../output/process/Spain/data.max.height.csv") ## I was planning to save processed data in that folder
-=======
write.csv(data.max.height, file = "../../output/process/Spain/max.height.csv") ## I was planning to save processed data in that folder
->>>>>>> Makefile for data processing
-
################################## FORMAT INDIVIDUAL TREE DATA
data.spain$G <- data.spain[["adbh"]] ## diameter growth in mm per year
--
GitLab