mirror of
https://github.com/github/codeql-action.git
synced 2026-05-08 06:40:19 +00:00
merge chris
This commit is contained in:
+7
@@ -1,4 +1,11 @@
|
||||
<<<<<<< HEAD:node_modules/async/LICENSE
|
||||
Copyright (c) 2010-2018 Caolan McMahon
|
||||
=======
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2014 Jonathan Ong me@jongleberry.com
|
||||
>>>>>>> origin/results-cache-test:node_modules/mime-db/LICENSE
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
Reference in New Issue
Block a user