1.0.1

.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ######################################################################
 # Build Tools
 
@@ -44,3 +45,31 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+=======
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+>>>>>>> c801920fb42d7235b4c6bde29bc433b89846e064

README.md

@@ -0,0 +1,3 @@
+# unis_sip
+
+紫光汇智sip系统