diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:50:32 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:50:32 -0700 |
| commit | 648efff1f61623b3812331a389cceb9524786246 (patch) | |
| tree | 730549561c0687ab7818703c35f155d598c0c6be | |
| parent | 3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8 (diff) | |
| download | infinitytier-648efff1f61623b3812331a389cceb9524786246.tar.gz infinitytier-648efff1f61623b3812331a389cceb9524786246.zip | |
Delete merge temp file.
| -rw-r--r-- | .gitignore.orig | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/.gitignore.orig b/.gitignore.orig deleted file mode 100644 index c4550925..00000000 --- a/.gitignore.orig +++ /dev/null @@ -1,59 +0,0 @@ -/ext/llvm-g++-Xcode4.6.2 -/ext/llvm-g++-Xcode4.6.2.tar.bz2 -/zerotier-* -/ZeroTierUI/*.user -*.o -.DS_Store -.Apple* -*.dSYM -/netconf-service/node_modules -/ipch -/windows/ZeroTierOne.sdf -/windows/ZeroTierOne.v11.suo -/windows/x64 -/windows/Win32 -/windows/*/x64 -/windows/*/Win32 -/windows/ZeroTierOne/Release -/windows/ZeroTierOneService/obj -/windows/ZeroTierOneService/bin -/windows/Build -/ext/installfiles/windows/ZeroTier One-SetupFiles -/ext/installfiles/windows/Prerequisites -*.log -*.opensdf -*.user -*.cache -*.obj -*.tlog -*.pid -/*.deb -/*.rpm -/build-* -/ZeroTierOneInstaller-* -.qmake.stash -*.autosave -/ZeroTier One.dmg -/root-topology/bin2c -/root-topology/mktopology -/root-topology/*.secret -<<<<<<< HEAD -/testnet/local-testnet/n???? -/testnet/local-testnet/*/peers.persist -/testnet/local-testnet/*/authtoken.secret -/testnet/local-testnet/*/*.log -/testnet/local-testnet/*/*.old -/testnet/local-testnet/*/root-topology -/testnet/local-testnet/*/local.conf -/testnet/local-testnet/*/networks.d -/netconf/netconf.db -java/obj/ -java/libs/ -java/bin/ -java/classes/ -java/doc/ -windows/ZeroTierOne/Debug/ -======= -/root-topology/test/supernodes -/root-topology/test/test-root-topology ->>>>>>> adamierymenko-dev |