Skip to content

Commit

Permalink
Item14288: Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDaum committed Jan 23, 2018
2 parents d9d2549 + 674d102 commit 2f7e6bb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/build.pl
Expand Up @@ -6,7 +6,5 @@

# Create the build object
my $build = new Foswiki::Contrib::Build('JsonRpcContrib');

# Build the target on the command line, or the default target
$build->build( $build->{target} );

2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/ExtensionInstallerTests.pm
Expand Up @@ -1877,7 +1877,7 @@ sub test_Package_loadInstaller {

my @files = $pkg->_listFiles();
$this->assert_num_equals(
4,
5,
scalar @files,
"Unexpected number of files in EmptyPlugin manifest"
);
Expand Down

0 comments on commit 2f7e6bb

Please sign in to comment.