From 3b8b8a2ee35b5ca603f02d5eaeac8c3d7334353d Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 16 Nov 2017 22:22:38 -0500
Subject: pull_request: able to ignore whitespace when check conflict (#4834)

---
 pkg/form/repo.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkg/form')

diff --git a/pkg/form/repo.go b/pkg/form/repo.go
index 32c5effc..a524560f 100644
--- a/pkg/form/repo.go
+++ b/pkg/form/repo.go
@@ -102,6 +102,7 @@ type RepoSetting struct {
 	TrackerURLFormat      string
 	TrackerIssueStyle     string
 	EnablePulls           bool
+	PullsIgnoreWhitespace bool
 	PullsAllowRebase      bool
 }
 
-- 
cgit v1.2.3