rebase

2026-03-23 12:38:26 -05:00
parent 7517573ccc 58fd1d240c
commit fdf55e1657
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@@ -175,6 +175,7 @@
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS
+<<<<<<< HEAD

   APPENDIX: How to apply the Apache License to your work.

@@ -201,3 +202,5 @@
   See the License for the specific language governing permissions and
   limitations under the License.

+=======
+>>>>>>> 58fd1d240c01295d9dfbdb285b97757dc7f89ed1