Nebucatnetzer
/
ibz
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove a merge part

This commit is contained in:
Andreas Zweili 2017-05-21 12:38:03 +02:00
parent 403c762f18
commit 48caa8dc35
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/2_sem/SEP Prüfung/SEP Prüfung/SEP Prüfung.ssmssqlproj
View File

@ -1,13 +1,3 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8"?>
<SqlWorkbenchSqlProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="SqlWorkbenchSqlProject">
<Items>
<LogicalFolder Name="Connections" Type="2" />
<LogicalFolder Name="Queries" Type="0" />
<LogicalFolder Name="Miscellaneous" Type="3" />
</Items>
=======
<?xml version="1.0" encoding="utf-8"?>
<SqlWorkbenchSqlProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="SqlWorkbenchSqlProject">
<Items>
@ -16,5 +6,4 @@
<LogicalFolder Name="Miscellaneous" Type="3" />
</Items>
>>>>>>> 91c37e0a13ad9148d1d6356ee6197441ad0a42e5
</SqlWorkbenchSqlProject>