Commit a519281c authored by Chris Morris's avatar Chris Morris
Browse files

Merge remote-tracking branch 'origin/master'

parents 39527068 8d1ad7f8

.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
.idea/

*.idea/

Java_MarkLogic_Template/.idea/vcs.xml

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="VcsDirectoryMappings">

    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />

  </component>

</project>
 
 No newline at end of file