From: Andreas Unterkircher <unki@netshadow.at>
Date: Mon, 18 Aug 2008 04:16:37 +0000 (+0200)
Subject: fix conflict in phpfspot.class.php
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4712f548702a1a7f9ad86360ebd1fa44356791a3;p=phpfspot.git

fix conflict in phpfspot.class.php

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---

4712f548702a1a7f9ad86360ebd1fa44356791a3