[pollen] branch develop updated (f36b6f7 -> 297c9b9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from f36b6f7 check if conf.restURL is set else print the error new 297c9b9 fix test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 297c9b9143d6be0952ed224b0a090e273418ecb0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 16:37:38 2014 +0200 fix test Summary of changes: pollen-ui-angular/src/test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 297c9b9143d6be0952ed224b0a090e273418ecb0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 16:37:38 2014 +0200 fix test --- pollen-ui-angular/src/test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js index 8c352a3..339aa00 100644 --- a/pollen-ui-angular/src/test/karma.conf.js +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -15,7 +15,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'src/main/webapp/js/conf.js.exemple', // fix conf is not defined for controller + 'src/main/webapp/js/conf.js.example', // fix conf is not defined for controller 'src/main/webapp/lib/jquery/dist/jquery.min.js', 'src/main/webapp/lib/ckeditor/ckeditor.js', 'src/main/webapp/lib/angular/angular.js', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm