This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a8c8fd26e2c8bf107f88bc5b3ded42720d4e65b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon May 19 16:37:02 2014 +0200 delete conflit on ui conf.js --- .gitignore | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d3ae13..63b6d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ atlassian-ide-plugin.xml target/* */target/* +pollen-ui-angular/src/main/webapp/js/conf.js diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 477cb3b..f7b1041 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -<<<<<<< HEAD angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.