Skip to content

Commit

Permalink
Merge branch '1.26.x' of https://github.com/GeoWebCache/geowebcache i…
Browse files Browse the repository at this point in the history
…nto 1.26.x
  • Loading branch information
petersmythe committed Sep 18, 2024
2 parents 98f1afa + 54e1b1a commit 63a1e8a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions geowebcache/core/src/main/resources/geowebcache.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<gwcConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://geowebcache.org/schema/1.25.0"
xsi:schemaLocation="http://geowebcache.org/schema/1.25.0 http://geowebcache.org/schema/1.25.0/geowebcache.xsd">
xmlns="http://geowebcache.org/schema/1.26.0"
xsi:schemaLocation="http://geowebcache.org/schema/1.26.0 http://geowebcache.org/schema/1.26.0/geowebcache.xsd">
<version>1.8.0</version>
<backendTimeout>120</backendTimeout>
<serviceInformation>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace"
targetNamespace="http://geowebcache.org/schema/1.25.0" xmlns:gwc="http://geowebcache.org/schema/1.25.0"
elementFormDefault="qualified" version="1.25.0">
targetNamespace="http://geowebcache.org/schema/1.26.0" xmlns:gwc="http://geowebcache.org/schema/1.26.0"
elementFormDefault="qualified" version="1.26.0">

<xs:element name="gwcConfiguration">
<xs:annotation>
Expand Down

0 comments on commit 63a1e8a

Please sign in to comment.