#2 restructure

DICE-UNC · May 25, 2016 · 4f81fe6 · 4f81fe6
1 parent cbfc186
commit 4f81fe6
Show file tree

Hide file tree

Showing 12 changed files with 269 additions and 1,035 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 **/.classpath
-.DS_Store
+**/.DS_Store
 **/nb-configuration.xml
 **/.springBeans
 **/testing.properties
 **/*.eml
-**/*.iml
 .idea
 .project
 .metadata
@@ -18,147 +17,14 @@ bin
 *.war
 *.log
 */nbactions.xml  
+*.eml
 nbactions.xml
 testing.properties
 */test-output
 JargonVersion.java
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  GNU nano 2.0.6                                            File: .gitignore                                                                                               
-
-**/.classpath
-.DS_Store
-**/nb-configuration.xml
-**/.springBeans
-**/testing.properties
-.project
-.metadata
-.DS_Store
-Servers
-.settings
-.classpath
-target
-mvn-repo
-bin
-*.war
-*.log
-*/nbactions.xml
-nbactions.xml
-testing.properties
-*/test-output
-JargonVersion.java
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  GNU nano 2.0.6                                            File: .gitignore                                                                                               
-
-**/.classpath
-.DS_Store
-**/nb-configuration.xml
-**/.springBeans
-**/testing.properties
-.project
-.metadata
-.DS_Store
-Servers
-.settings
-.classpath
-target
-mvn-repo
-bin
-*.war
-*.log
-*/nbactions.xml
-nbactions.xml
-testing.properties
-*/test-output
-JargonVersion.java
+**/${test.option.mount.basedir}
+<<<<<<< HEAD
+**/*.*~
+=======
+*.*~
+>>>>>>> origin/master
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md