diff options
| -rw-r--r-- | core/Updates/0.5.4.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php index aedab951b3..d27a95d522 100644 --- a/core/Updates/0.5.4.php +++ b/core/Updates/0.5.4.php @@ -1,4 +1,3 @@ -<<<<<<< .mine <?php /** * Piwik - Open source web analytics |