fixed merging errors
authorpk910 <philipp@zoelle1.de>
Sun, 13 Oct 2013 13:36:31 +0000 (15:36 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 13 Oct 2013 13:36:31 +0000 (15:36 +0200)
commit04b1df59f6e9c029d88dd203d7dac395122cc9cb
treec6ec563c06da4e54d2f156a7b3bbfe257c831385
parentd9b4a6ae7a926fa03878a815f283b9b287c1ad78
fixed merging errors
GITManagedWebpage.class.php