Skip to content
GitLab
Commit 9c2d0c1f authored by Francesco Chicchiriccò's avatar Francesco Chicchiriccò
Browse files

Whitenoise: bad merge

parent 84c6cfbc
Hide whitespace changes
Inline Side-by-side
sf-provision-data/pom.xml
View file @ 9c2d0c1f
......@@ -68,23 +68,6 @@ limitations under the License.
</dependency>
</dependencies>
<<<<<<< 728d9958d89b188b4020a4cddeba52b934ae3ade
=======
<build>
<finalName>SecurityfilterServletProxy</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
>>>>>>> Splitting the code into a small AL 2.0 library for shared usage with ConnId Security Filter
<repositories>
<repository>
<id>sonatype</id>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment