Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
latel committed Nov 26, 2016
2 parents 51e31a0 + fac07c7 commit b644bb6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dist/logline.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ return /******/ (function(modules) { // webpackBootstrap
return this;
}

Logline.database(database);
Logline.database(database || Logline._database);
Logline._initProtocol(protocol);
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/logline.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/configure
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class Logline {
return this;
}

Logline.database(database);
Logline.database(database || Logline._database);
Logline._initProtocol(protocol);
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion src/logline.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class Logline {
return this;
}

Logline.database(database);
Logline.database(database || Logline._database);
Logline._initProtocol(protocol);
return this;
}
Expand Down

0 comments on commit b644bb6

Please sign in to comment.