Skip to content

Commit

Permalink
fix merge: theme had wrong end line
Browse files Browse the repository at this point in the history
  • Loading branch information
sxywu committed Sep 24, 2016
1 parent 6f9ec22 commit b54a677
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function parseSong(songNum) {
// the theme isn't the same as the last one
if (!_.isEqual(lastTheme, theme)) {
// if there's a previous theme, save it
saveThemeData(lastLineTheme, lastTheme, character);
saveThemeData(lastLineTheme, lastTheme, lastCharacter);

// and then create the next one with line key and actual line
// only if there is a theme
Expand Down Expand Up @@ -169,7 +169,7 @@ function parseSong(songNum) {
saveLineData(lastLine);
saveThemeData(lastLineTheme, lastTheme, character);
}

lastCharacter = character;
lastTheme = theme;
});
Expand Down

0 comments on commit b54a677

Please sign in to comment.