Skip to content

Commit

Permalink
resolve merge conflict in axis_utils2
Browse files Browse the repository at this point in the history
  • Loading branch information
mlee03 authored and mlee03 committed Jul 26, 2023
1 parent db0dcca commit e3f08ec
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions axis_utils/include/axis_utils2.inc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<<<<<<< HEAD
=======

>>>>>>> origin/main
!***********************************************************************
!* GNU Lesser General Public License
!*
Expand Down

0 comments on commit e3f08ec

Please sign in to comment.