[GitHub] junichi11 closed pull request #201: Remove an unused line

[GitBox <gi...@apache.org>]

junichi11 closed pull request #201: Remove an unused line
URL: https://github.com/apache/incubator-netbeans/pull/201
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/j2ee.persistence/l10n.list b/j2ee.persistence/l10n.list
index 2b92cab4a..752d8039b 100644
--- a/j2ee.persistence/l10n.list
+++ b/j2ee.persistence/l10n.list
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services