résolution conflit

[gestion-adh.git] / bin / pre-commit-hook

diff --git a/bin/pre-commit-hook b/bin/pre-commit-hook
index 2bd3c77080d0438100ca804c34e4db631ec636d7..9dd900bb51f323d5b375d2e7fa2d07a85add8803 100755 (executable)
--- a/bin/pre-commit-hook
+++ b/bin/pre-commit-hook
@@ -1,5 +1,21 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 #-*- coding: utf-8 -*-
+#
+# Système de gestion des adhésions de Nos oignons
+# Copyright © 2013-2014 Nos oignons <contact@nos-oignons.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'bundler'