Merge branch 'master' of github.com:CodeChefVIT/devsoc-be-25

Author: RustyDev24

pkg/controller/admin.go

@@ -292,11 +292,20 @@ func CreatePanel(c echo.Context) error {
 		PhoneNo: pgtype.Text{
 			String: panel.PhoneNo,
 		},
+<<<<<<< HEAD
 		Role:       "panel",
 		IsLeader:   true,
 		IsVerified: true,
 		IsBanned:   false,
 		Gender:     panel.Gender,
+=======
+		Role:          "panel",
+		IsLeader:      true,
+		IsVerified:    true,
+		IsBanned:      false,
+		Gender:        panel.Gender,
+		GithubProfile: &panel.GithubProfile,
+>>>>>>> 11fcf2e2295a69d11c2a99ea76ae68f7fc17df97
 	}
 	panelDb.ID, _ = uuid.NewV7()
 	panelDb.TeamID = uuid.NullUUID{

pkg/controller/export.go

@@ -85,7 +85,11 @@ func ExportUsers(c echo.Context) error {
 			user.TeamID.UUID.String(),
 			hostelBlock,
 			roomNo,
+<<<<<<< HEAD
 			githubProfile,
+=======
+			*user.GithubProfile,
+>>>>>>> 11fcf2e2295a69d11c2a99ea76ae68f7fc17df97
 			user.Role,
 			strconv.FormatBool(user.IsLeader),
 			strconv.FormatBool(user.IsVerified),