misc

kwstat · Mar 12, 2024 · 1a2742d · 1a2742d
1 parent 23d4457
commit 1a2742d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,9 +21,6 @@ Suggests:
     sfsmisc,
     testthat
 License: MIT + file LICENSE
-<<<<<<< Updated upstream
-LazyData: yes
-=======
 LazyData: true
 >>>>>>> Stashed changes
 Encoding: UTF-8