Skip to content

Commit

Permalink
MINOR Fixed merge errors (copied from 31d7a00)
Browse files Browse the repository at this point in the history
  • Loading branch information
chillu committed Mar 27, 2011
1 parent 5da903e commit 0bcb57d
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions code/SiteTree.php
Original file line number Diff line number Diff line change
Expand Up @@ -1674,12 +1674,6 @@ function VirtualPages() {
*/
function getCMSFields() {
require_once("forms/Form.php");
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js");
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/UpdateURL.js');

// Status / message
// Create a status message for multiple parents
if($this->ID && is_numeric($this->ID)) {
Expand Down

0 comments on commit 0bcb57d

Please sign in to comment.