corrected merge issue in DESCRIPTION

btskinner · Oct 1, 2019 · ea3f066 · ea3f066
1 parent 402a960
commit ea3f066
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,10 +1,6 @@
 Package: rscorecard
 Title: A Method to Download Department of Education College Scorecard Data
-<<<<<<< HEAD
 Version: 0.13.0
-=======
-Version: 0.12.0
->>>>>>> f1f762549acfb3583efaa102fbc356d44c6d66d8
 Authors@R: person("Benjamin", "Skinner",
 	          email = "btskinner@coe.ufl.edu",
     	          role = c("aut", "cre"),