You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2017/10/30 01:14:01 UTC
[incubator-netbeans] branch master updated: Remove an unused line
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b039c6b Remove an unused line
b039c6b is described below
commit b039c6bf1a27c9e5488f4e87322077c7460a5636
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Fri Oct 27 14:45:46 2017 +0900
Remove an unused line
---
j2ee.persistence/l10n.list | 1 -
1 file changed, 1 deletion(-)
diff --git a/j2ee.persistence/l10n.list b/j2ee.persistence/l10n.list
index 2b92cab..752d803 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
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].