init

VincentGuyader · Jun 9, 2016 · f9b8184 · f9b8184
2 parents c6ffa28 + 93ebf31
commit f9b8184
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 93 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,40 @@
+<<<<<<< HEAD
 .Rproj.user
 .Rhistory
 .RData
 .Ruserdata
+=======
+# History files
+.Rhistory
+.Rapp.history
+
+# Session Data files
+.RData
+
+# Example code in package build process
+*-Ex.R
+
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
+# RStudio files
+.Rproj.user/
+
+# produced vignettes
+vignettes/*.html
+vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth
+
+# knitr and R markdown default cache directories
+/*_cache/
+/cache/
+
+# Temporary files created by R markdown
+*.utf8.md
+*.knit.md
+>>>>>>> 93ebf31009427a7e38c19ffe79f9e26fffaaccf6
diff --git a/DESCRIPTION b/DESCRIPTION
diff --git a/NAMESPACE b/NAMESPACE
diff --git a/R/nice.R b/R/nice.R
diff --git a/inst/rstudio/addins.dcf b/inst/rstudio/addins.dcf
diff --git a/man/hello.Rd b/man/hello.Rd
diff --git a/nicetitle.Rproj b/nicetitle.Rproj
diff --git a/plop b/plop