remove userdata and update gitignore

cloudwu / pbc

A protocol buffers library for C

MIT License

1.62k stars 568 forks source link

Closed davidxifeng closed 8 years ago

davidxifeng commented 8 years ago

删除应该忽略的文件

davidxifeng commented 8 years ago

问下为什么不合呢？

cloudwu commented 8 years ago

昨天点错了，我以为已经合并了。;)

cloudwu commented 8 years ago

奇怪, 如果没有冲突，默认的那个位置就是合并+关闭。这个 pr 似乎不是的。