From 53a1aac33c799b420ac3369eb7c1a0b1c399f4d0 Mon Sep 17 00:00:00 2001
From: "karthik.bhandary" <karthik.bhandary@kfintech.com>
Date: Fri, 27 Mar 2026 18:59:37 +0000
Subject: [PATCH] merge conflict fix

---
 routers/api/v1/org/org.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index a1f6714ad1..5f7d4fb608 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -5,8 +5,8 @@
 package org
 
 import (
-	"fmt"
 	"errors"
+	"fmt"
 	"net/http"
 
 	activities_model "code.gitea.io/gitea/models/activities"