summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-01 16:17:33 +0000
committerAndrei Karas <akaras@inbox.ru>2016-07-01 16:17:33 +0000
commitdf0709d6ce8be17304ae80aaea46e6589d84dc12 (patch)
treedfb31db0361b73a9740edb78a345aadd205ee098
parent4995953f1a3b4172a7ee53e50ba0771ba06678b9 (diff)
parent689b7c579cd98f15f8e84a0b289d18125d895e39 (diff)
downloadevol-tools-df0709d6ce8be17304ae80aaea46e6589d84dc12.tar.gz
evol-tools-df0709d6ce8be17304ae80aaea46e6589d84dc12.tar.bz2
evol-tools-df0709d6ce8be17304ae80aaea46e6589d84dc12.tar.xz
evol-tools-df0709d6ce8be17304ae80aaea46e6589d84dc12.zip
Merge branch 'fix-tools' into 'master'
Fix link in xsd file Add testxml/errors.txt to .gitignore See merge request !2
-rw-r--r--.gitignore3
-rw-r--r--testxml/xsd/xlink.xsd1
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b26fc54..d65c486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@ dyecmd/src/dyecmd
dyecmd/src/CMakeFiles/
dyecmd/src/Makefile
dyecmd/src/cmake_install.cmake
+
+# testxml
+testxml/errors.txt
diff --git a/testxml/xsd/xlink.xsd b/testxml/xsd/xlink.xsd
index 6349600..2c53ec3 100644
--- a/testxml/xsd/xlink.xsd
+++ b/testxml/xsd/xlink.xsd
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink">
- <xs:import schemaLocation="xmlspec-its.xsd"/>
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
<xs:attribute name="type">
<xs:simpleType>