diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:10:55 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:10:55 +0200 |
| commit | d8ef630f2d4d32eee998969e548d36dc629340d4 (patch) | |
| tree | 92a509fda736fb9a6a119dcb6b16c40607ed0fa5 /system/core/Benchmark.php | |
| parent | 02d45b56c57f6cf9f8c0fabe7f8b7ed761bd5a9b (diff) | |
| parent | c2a37669107829b032b08562e784416713f569b1 (diff) | |
Fixed conflict.
Diffstat (limited to 'system/core/Benchmark.php')
| -rwxr-xr-x[-rw-r--r--] | system/core/Benchmark.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index 515550e9f..a200727ab 100644..100755 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -29,6 +29,11 @@ */ class CI_Benchmark { + /** + * List of all benchmark markers and when they were added + * + * @var array + */ var $marker = array(); // -------------------------------------------------------------------- |