fixed conflicts

NOAA-EMC · Dec 4, 2023 · 66cc6b7 · 66cc6b7
1 parent 41d64e8
commit 66cc6b7
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/model/src/w3iopomd.F90 b/model/src/w3iopomd.F90
@@ -1133,9 +1133,6 @@ SUBROUTINE W3IOPE ( A )
     !/
   END SUBROUTINE W3IOPE
 
-  !> Read or write point output.
-  !>
-<<<<<<< HEAD
   !> Read point output in netCDF format.
   !>
   !> @param[out] IOTST Test indictor for reading.
@@ -1589,11 +1586,6 @@ END SUBROUTINE W3IOPON
   !> This subroutine can either read or write the point output file,
   !> depending on the value of the first parameter.
   !>
-=======
-  !> This subroutine can either read or write the point output file,
-  !> depending on the value of the first parameter.
-  !>
->>>>>>> develop
   !> When reading, the entire file is read with one call to this
   !> subroutine.
   !>