Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fixing docblock in JButton #459

Merged
merged 1 commit into from

2 participants

@jonnsl

Closes #457 - removes left-over merge text.

@eddieajau eddieajau merged commit 9287d18 into joomla:staging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 22, 2011
  1. @jonnsl

    fixing docblock

    jonnsl authored
This page is out of date. Refresh to see the latest.
Showing with 0 additions and 3 deletions.
  1. +0 −3  libraries/joomla/html/toolbar/button.php
View
3  libraries/joomla/html/toolbar/button.php
@@ -38,11 +38,8 @@
/**
* Constructor
-<<<<<<< HEAD
*
* @param object $parent The parent
-=======
->>>>>>> 1739596a2e65b7143de644b4e755263ae63d6cd5
*/
public function __construct($parent = null)
{
Something went wrong with that request. Please try again.