From 5ecc49f8611a21eeea36cc35ef05500e076a3f93 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Wed, 19 Jan 2022 22:47:06 +0530 Subject: [PATCH] fix(doc): merge conflict in contributing --- .github/CONTRIBUTING.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4ebdba0..94b6dfd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -70,11 +70,7 @@ docker run --name arangodb -d -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb If you are adding new resolver, 1. create new resolver test file [here](https://github.com/authorizerdev/authorizer/tree/main/server/__test__) -<<<<<<< HEAD Naming convention filename: `resolver_name_test.go` function name: `resolverNameTest(t *testing.T, s TestSetup)` -======= - Naming convention filename: `resolver_name_test.go` function name: `resolverNameTest(s TestSetup, t *testing.T)` ->>>>>>> main 2. Add your tests [here](https://github.com/authorizerdev/authorizer/blob/main/server/__test__/resolvers_test.go#L38) **Command to run tests:**