Initial commit
adding new plugins to wordpress
update of wordpress to version 3.6.1
change on footer.php file, adding span testing element
change to footer.php by clone team , adding span testing element
Merge remote-tracking branch 'origin/master'
changes to footer.php file, testing merge conflict
adding conflict span to footer.php
change to footer.php addin conflictClone span
conflict on footer.php resolved
more merge conflict testing on footer.php
more changes to footer.php in clone repository-merge conflict testing
merge conflict resolved
merge conflict resolved
from footer.php.bak to footer.php
changes to footer.php file, pull down from origin/master
new testing for merge conflicts in footer.php
more changes in footer.php in clone for testing merge conflicts
merge conflicts resolved
still testng for merging conflicts