1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/elasticsearch8_ynh.git synced 2024-09-03 18:26:26 +02:00

First commit (based on elasticsearch7_ynh)

This commit is contained in:
Florent 2023-01-13 12:22:21 +01:00
parent c92c5985ea
commit b65a0b5cfe

View file

@ -643,11 +643,15 @@ the "copyright" line and a pointer to where the full notice is found.
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
======= =======
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) >>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
=======
along with this program. If not, see <http://www.gnu.org/licenses/>.
>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
@ -663,8 +667,13 @@ specific requirements.
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see For more information on this, and how to apply and follow the GNU AGPL, see
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<https://www.gnu.org/licenses/>. <https://www.gnu.org/licenses/>.
======= =======
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.
>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) >>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))
=======
<http://www.gnu.org/licenses/>.
>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh))