Merge remote-tracking branch 'origin/master' into erp5-component

da9c1aa4 · Kazuhiko Shiozaki · 9281501a · b0843520 · da9c1aa4 · da9c1aa4
Commit da9c1aa4 authored Apr 08, 2014 by Kazuhiko Shiozaki
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

component/gcc/buildout.cfg component/gcc/buildout.cfg +1 -1

software/jio/software.cfg software/jio/software.cfg +0 -1

No files found.
--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
 # GNU C Compiler
-# Mostly required to support languages different then C or C++
+# Mostly required to support languages different than C or C++
 [buildout]
 extends =
  ../m4/buildout.cfg

--- a/software/jio/software.cfg
+++ b/software/jio/software.cfg
@@ -4,7 +4,6 @@ extends =
  ../../stack/slapos.cfg
  ../../component/git/buildout.cfg
  ../../component/phantomjs/buildout.cfg
-  ../../component/git/buildout.cfg
  ../../component/python-2.7/buildout.cfg
  ../../component/python-setuptools/buildout.cfg