Skip to content
Snippets Groups Projects
Commit de2a4004 authored by Geurtjens,D. (Douwe Geurtjens)'s avatar Geurtjens,D. (Douwe Geurtjens)
Browse files

Merge branch 'Different-JSON-Format' of... 

Merge branch 'Different-JSON-Format' of https://git.science.uu.nl/GravenvanPolaris/query-conversion into Different-JSON-Format

# Conflicts:
#	aql/convertQuery.go
#	realtest.json
parents 0e17ac0a 41cf4778
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 17 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment