Fix merge conflicts

backend/src/variables/index.ts

@@ -28,8 +28,6 @@ import {
   MEMBER,
   INVITED,
   ACCEPTED,
-  COMPLETED,
-  GRANTED
 } from './organization';
 import { SECRET_SHARED, SECRET_PERSONAL } from './secret';
 import { EVENT_PUSH_SECRETS, EVENT_PULL_SECRETS } from './event';
@@ -48,8 +46,6 @@ export {
   MEMBER,
   INVITED,
   ACCEPTED,
-  COMPLETED,
-  GRANTED,
   SECRET_SHARED,
   SECRET_PERSONAL,
   ENV_DEV,

backend/src/variables/organization.ts

@@ -9,16 +9,10 @@ const INVITED = 'invited';
 // -- organization
 const ACCEPTED = 'accepted';
 
-// -- workspace
-const COMPLETED = 'completed';
-const GRANTED = 'granted';
-
 export {
     OWNER,
     ADMIN,
     MEMBER,
     INVITED,
-    ACCEPTED,
-    COMPLETED,
-    GRANTED
+    ACCEPTED
 }