Skip to content

Commit

Permalink
Fixed merge problems
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigogs committed Jul 30, 2018
1 parent 34b4df5 commit 0c09f76
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Rodrigo Gomes da Silva <rodrigo.gomes@involves.com.br> (https://github.com/rodrigogs)
Rodrigo Gomes da Silva <rodrigo.smscom@gmail.com> (https://github.com/rodrigogs)
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2018, Involves Tecnologia
Copyright (c) 2018, Rodrigo Gomes da Silva
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

A [node.js](https://nodejs.org) package that watches a MySQL database and runs callbacks on matched events.

This package is based on the [original ZongJi](https://github.com/nevill/zongji) and the [original mysql-events](https://github.com/spencerlambert/mysql-events) modules. Please make sure that you meet the requirements described at [ZongJi](https://github.com/involves/zongji#installation), like MySQL binlog etc.
This package is based on the [original ZongJi](https://github.com/nevill/zongji) and the [original mysql-events](https://github.com/spencerlambert/mysql-events) modules. Please make sure that you meet the requirements described at [ZongJi](https://github.com/rodrigogs/zongji#installation), like MySQL binlog etc.

Check [@kuroski](https://github.com/kuroski)'s [mysql-events-ui](https://github.com/kuroski/mysql-events-ui) for a `mysql-events` UI implementation.

## Install
```sh
npm install @involves/mysql-events
npm install @rodrigogs/mysql-events
```

## Quick Start
Expand Down Expand Up @@ -246,4 +246,4 @@ It has the following structure:
**Make sure the database user has the privilege to read the binlog on database that you want to watch on.**

## LICENSE
[BSD-3-Clause](https://github.com/involves/mysql-events/blob/master/LICENSE) © Involves Tecnologia
[BSD-3-Clause](https://github.com/rodrigogs/mysql-events/blob/master/LICENSE) © Rodrigo Gomes da Silva

0 comments on commit 0c09f76

Please sign in to comment.