Merge remote-tracking branch 'origin/master'

WyriHaximus · WyriHaximus · commit 901ee5a63553 · 2016-11-20T21:42:35.000+01:00
diff --git a/examples/resolve_config.php b/examples/resolve_config.php
@@ -3,7 +3,7 @@
 $configFile = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'config.php';
 
 if (!file_exists($configFile)) {
-    echo 'No config file found, copy config.sample.php to config.php and your Twitter OAuth details.', PHP_EOL;
+    echo 'No config file found, copy config.sample.php to config.php and add your Twitter OAuth details.', PHP_EOL;
     exit(1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`$configFile = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'config.php';`
`4`	`4`
`5`	`5`	`if (!file_exists($configFile)) {`
`6`		`- echo 'No config file found, copy config.sample.php to config.php and your Twitter OAuth details.', PHP_EOL;`
	`6`	`+ echo 'No config file found, copy config.sample.php to config.php and add your Twitter OAuth details.', PHP_EOL;`
`7`	`7`	`exit(1);`
`8`	`8`	`}`
`9`	`9`