Skip to content

Commit 38b46af

Browse files
authored
Merge branch 'master' into ygree/fix-play-jaxrs-resource-name-priority
2 parents 16ca521 + c4e17f1 commit 38b46af

File tree

249 files changed

+5491
-3386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+5491
-3386
lines changed

.circleci/cancel_workflow.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

.circleci/checkout_merge_commit.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

.circleci/collect_libs.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.circleci/collect_results.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function get_source_file () {
3535
fi
3636
done
3737
done < <(grep -rl "class $class" "$file_path")
38-
file_path="$common_root"
38+
file_path="/$common_root"
3939
fi
4040
}
4141

0 commit comments

Comments
 (0)