resolved conflict

pull/5/head
Felix Prahl-Kamps 2018-07-22 20:25:47 +02:00
commit 927f1776d9
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
![MispBump Logo](./images/mispbump.svg) ![MispBump Logo](./images/mispbump.svg)
# MISPBump # MISPBump
With MISPBump it is easy to synchronise events on different MISP instances. Instead of generating organisations, sync-users and sync-servers you only have to scan two QR-Codes and you are ready for syncing. With MISPBump it is easy to synchronise events on different MISP instances. Instead of generating organisations, sync-users and sync-servers you only have to scan two QR-Codes and you are ready for syncing.