fixed unrelated histories

canada-ca · Jan 30, 2021 · 80c9de5 · 80c9de5
2 parents 4e10781 + 98cd0ae
commit 80c9de5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -19,4 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+<<<<<<< HEAD
 
+=======
+>>>>>>> tbs/main
diff --git a/README.md b/README.md
@@ -31,4 +31,4 @@ Accellerator templates to be used with bootstrapping new environments to comply
 
 Makes use of [Open Policy Agent](https://www.openpolicyagent.org/) and GCP's [Asset Invetory API](https://cloud.google.com/asset-inventory) to validate compliance of deployed resources.
 
-See [documentation](guardrails-validation/README.md)
+See [documentation](guardrails-validation/README.md)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@ Accellerator templates to be used with bootstrapping new environments to comply

		Makes use of [Open Policy Agent](https://www.openpolicyagent.org/) and GCP's [Asset Invetory API](https://cloud.google.com/asset-inventory) to validate compliance of deployed resources.

		See [documentation](guardrails-validation/README.md)
		See [documentation](guardrails-validation/README.md)