halfpastfouram /
phpchartjs
@@ -97,10 +97,4 @@ |
||
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - return $data; |
|
| 101 | - } |
|
| 102 | -} |
|
| 103 | ->>>>>>> 6d743af... Simplified getArrayCopy method |
|
| 104 | -======= |
|
| 105 | -} |
|
| 106 | ->>>>>>> e69d8b3... Add unit test making sure the ArraySerializable trait is working well. |
|
| 100 | + return $data |
|
| 107 | 101 | \ No newline at end of file |
