I have no idea

Merge branch 'master' of https://github.com/asgr/magicaxis

# Conflicts:
#	man/magicaxis-package.Rd

DESCRIPTION

@@ -2,7 +2,7 @@ Package: magicaxis
 Type: Package
 Title: Pretty Scientific Plotting with Minor-Tick and Log Minor-Tick Support
 Version: 2.4.3
-Date: 2023-11-214
+Date: 2023-11-15
 Author: Aaron Robotham
 Maintainer: Aaron Robotham <[email protected]>
 Description: Functions to make useful (and pretty) plots for scientific plotting. Additional plotting features are added for base plotting, with particular emphasis on making attractive log axis plots.

man/magicaxis-package.Rd

@@ -13,7 +13,11 @@ Functions to make pretty axes (major and minor) on scientific plots. Particularl
 Package: \tab magicaxis\cr
 Type: \tab Package\cr
 Version: \tab 2.4.3\cr
+<<<<<<< HEAD
 Date: \tab 2023-11-10\cr
+=======
+Date: \tab 2023-11-14\cr
+>>>>>>> 1e670846911c98e910761810bad634b41d7b31e8
 License: \tab GPL-3 \cr
 Depends: \tab R (>= 2.13)\cr
 Suggests: \tab imager, fst, imageviewer, Rfits\cr

man/magplot.Rd

@@ -179,9 +179,11 @@ magplot(temp, xlim='auto', ylim='auto')
 
 #Some astronomy related examples (and how to display the solar symbol):
 
+\dontrun{
 temp=cbind(runif(10,8,12),runif(10,0,5))
 
 magplot(temp[,1:2], xlab=expression(M['\u0298']), ylab=expression(M['\u0298']/Yr), unlog='xy')
+}
 
 #With z scaling