diff options
| author | Bo Yang <teboring@google.com> | 2019-06-21 20:31:00 +0000 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2019-06-21 20:31:00 +0000 |
| commit | d581c76063e3a4cf468febda2ce8221418f0b813 (patch) | |
| tree | 03891c75b30d569e0e4dd4b7a3f8fc5e68119e64 /java/lite/pom.xml | |
| parent | 1f0d8172da990a05811ce975afd2d68948eeeb60 (diff) | |
| parent | 54288a01cebfd0bfa62ca581dd07ffd6f9c77f2c (diff) | |
| download | platform_external_protobuf-d581c76063e3a4cf468febda2ce8221418f0b813.tar.gz platform_external_protobuf-d581c76063e3a4cf468febda2ce8221418f0b813.tar.bz2 platform_external_protobuf-d581c76063e3a4cf468febda2ce8221418f0b813.zip | |
Merge branch 'master' into 3.9.x
Conflicts:
java/lite/pom.xml
java/util/pom.xml
Diffstat (limited to 'java/lite/pom.xml')
| -rw-r--r-- | java/lite/pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/lite/pom.xml b/java/lite/pom.xml index a1a8b4dcf..f6e1c250f 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -84,6 +84,7 @@ <resource> <directory>${basedir}/../core/src/main/java/com/google/protobuf</directory> <includes> + <!-- Keep in sync with //:BUILD --> <include>AbstractMessageLite.java</include> <include>AbstractParser.java</include> <include>AbstractProtobufList.java</include> |