diff options
| author | James Moger <james.moger@gmail.com> | 2016-11-18 18:48:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 18:48:38 -0500 |
| commit | 855a19a242d9ce0ebbbfe7baa120603d3c598f05 (patch) | |
| tree | aa160c8bdb2dc593af36c8646587b0c6544daf67 /src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html | |
| parent | e5068d689d47747778dcb7a6b967abbd600a30a4 (diff) | |
| parent | 7f33a835295216210b7ca63367a460d76f9738d0 (diff) | |
| download | gitblit-wicket-7.tar.gz gitblit-wicket-7.zip | |
Merge pull request #1153 from pingunaut/wicket-7wicket-7
Wicket Update and merge master
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html index 7a55b9f5..2c881efc 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -123,7 +123,8 @@ <div wicket:id="acceptNewTickets"></div>
<div wicket:id="requireApproval"></div>
<div wicket:id="mergeTo"></div>
-
+ <div wicket:id="mergeType"></div>
+
</div>
<!-- federation -->
|