git pull after arbo cleaning - resolve conflicts

stvales · Feb 13, 2018 · d4e65bc · d4e65bc
2 parents 5c6e4ac + 4e98a19
commit d4e65bc
Show file tree

Hide file tree

Showing 483 changed files with 23,532 additions and 4,401 deletions.
diff --git a/.gitignore b/.gitignore
@@ -859,4 +859,5 @@ dependencies/ios/ios/perPlatform/x86_64/share/zproject/czmq/ztimerset.api
 dependencies/ios/ios/perPlatform/x86_64/share/zproject/czmq/ztrie.api
 dependencies/ios/ios/perPlatform/x86_64/share/zproject/czmq/zuuid.api
 dependencies/ios/ios/perPlatform/x86_64/share/zproject/zyre/zyre.api
-dependencies/ios/ios/perPlatform/x86_64/share/zproject/zyre/zyre_event.api
+dependencies/ios/ios/perPlatform/x86_64/share/zproject/zyre/zyre_event.api
+zyreprobe.pro