From a73417c47479a3731afe83648e2ec2136e29e43c Mon Sep 17 00:00:00 2001
From: Vittorio Parrella <vittorioparrella+1@gmail.com>
Date: Mon, 16 Sep 2024 23:13:15 +0200
Subject: [PATCH] fix merge issue

---
 .github/workflows/integration.yml                 | 4 ++--
 service/service_darwin.go                         | 2 +-
 shared/cmd.go                                     | 2 +-
 workers/gateway/gateway_interface_linux.go        | 4 ++--
 workers/gateway/gateway_interface_windows_test.go | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 73cb15b..044647b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -9,7 +9,7 @@ run-name: Code Integration [${{ github.event_name }}][${{ github.head_ref || git
 
 jobs:
   docs:
-    if: true
+    if: false
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -322,7 +322,7 @@ jobs:
           done
 
   build-windows:
-    if: true
+    if: false
     runs-on: windows-latest
     env:
       GO_VERSION: 1.20.14
diff --git a/service/service_darwin.go b/service/service_darwin.go
index 5eb0910..291ab2c 100644
--- a/service/service_darwin.go
+++ b/service/service_darwin.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Project-Faster/qpep/logger"
+	"github.com/Project-Faster/qpep/shared/logger"
 )
 
 const (
diff --git a/shared/cmd.go b/shared/cmd.go
index 947921a..689ff27 100644
--- a/shared/cmd.go
+++ b/shared/cmd.go
@@ -1,7 +1,7 @@
 package shared
 
 import (
-	"github.com/parvit/qpep/shared/logger"
+	"github.com/Project-Faster/qpep/shared/logger"
 	"os/exec"
 	"strings"
 	"syscall"
diff --git a/workers/gateway/gateway_interface_linux.go b/workers/gateway/gateway_interface_linux.go
index 5e29db5..fa17019 100644
--- a/workers/gateway/gateway_interface_linux.go
+++ b/workers/gateway/gateway_interface_linux.go
@@ -2,9 +2,9 @@ package gateway
 
 import (
 	"fmt"
+	"github.com/Project-Faster/qpep/shared"
+	"github.com/Project-Faster/qpep/shared/logger"
 	"github.com/jackpal/gateway"
-	"github.com/parvit/qpep/shared"
-	"github.com/parvit/qpep/shared/logger"
 	"net"
 	"net/url"
 )
diff --git a/workers/gateway/gateway_interface_windows_test.go b/workers/gateway/gateway_interface_windows_test.go
index b53385d..fd16ba1 100644
--- a/workers/gateway/gateway_interface_windows_test.go
+++ b/workers/gateway/gateway_interface_windows_test.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/Project-Faster/monkey"
-	stderr "github.com/parvit/qpep/shared/errors"
+	stderr "github.com/Project-Faster/qpep/shared/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 	"net/url"