Merge branch 'master' of https://gitee.com/wcc_140409/libXt

Conflicts: libXt.spec
2020-07-24 16:14:37 +08:00 · 2020-07-24 16:14:37 +08:00 · f3a090ae03
commit f3a090ae03
parent 236f9e311d bf85ee94b0
2 changed files with 8 additions and 0 deletions
--- a/libXt-1.1.5.tar.bz2
+++ b/libXt-1.1.5.tar.bz2
--- a/libXt.spec
+++ b/libXt.spec
@ -59,8 +59,16 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 %{_docdir}/%{name}/*.xml

 %changelog
+<<<<<<< HEAD
 * Fri Jul 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
 - updata package
+=======
+* Wed Jun 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:change the directory of the license file
+>>>>>>> bf85ee94b061e41743c911cb5b4fb5c602d76815

 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.5-11
 - Type:bugfix