RT# 76968 - added header logo and css to map page, fixed address look up error, added...

[freeside.git] / httemplate / docs / license.html

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 9101b9f..1cce9b3 100644 (file)
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -133,8 +133,6 @@ under the terms of the MIT license.
 Contains the XRegExp library by Steven Levithan, licensed under the terms
 of the MIT license.
 
-<<<<<<< HEAD
-=======
 <P>
 Contains the Google Maps Longitude and Latitude Picker, by Richard Dancsi,
 licensed under the terms of the MIT license.
@@ -147,7 +145,10 @@ under the terms of the MIT license.
 Contains the form validation jQuery plugin <a href="https://jqueryvalidation.org/">jQuery Validation</a>  by Jörn Zaefferer, 
 licensed under the terms of MIT License.
 
->>>>>>> f650b4e... RT# 21110, Updated files to use jquery-validate jquery plugin.  This allows for field validation instead of just form validation.  Also updated footer so it does not use experimental keys on scalar.  Dereferenced hash ref prior to using keys.
+<P>
+Contains the leaflet JavaScript library <a href="http://leafletjs.com/">Leaflet JS</a>  by Vladimir Agafonkin,
+licensed under the terms of MIT License.
+
 <!-- artwork -->
 
 <P>