浏览代码

fixed build.sh

Fabien Potencier 13 年之前
父节点
当前提交
b7836663c6
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      Resources/bin/build.sh

+ 4 - 0
Resources/bin/build.sh

@@ -9,7 +9,11 @@
 
 DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"`
 cd $DIR
+<<<<<<< Updated upstream
 VERSION=`grep 'VERSION' vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php | sed -E "s/.*'(.+)'.*/\1/g"`
+=======
+VERSION=`grep ' VERSION ' vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php | sed -E "s/.*'(.+)'.*/\1/g"`
+>>>>>>> Stashed changes
 
 if [ ! -d "$DIR/build" ]; then
     mkdir -p $DIR/build