From 0704bf868d72878c6eef967ec1ae7aee0e80f7fa Mon Sep 17 00:00:00 2001 From: SharpKode Date: Sun, 31 Aug 2014 22:16:35 +0200 Subject: [PATCH] Cleanup --- .gitattributes | 8 -------- gd34emrs.iy3.txt | 20 -------------------- 2 files changed, 28 deletions(-) delete mode 100644 gd34emrs.iy3.txt diff --git a/.gitattributes b/.gitattributes index 412eeda..c6439c8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,6 @@ # Auto detect text files and perform LF normalization * text=auto -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - # Standard to msysgit *.doc diff=astextplain *.DOC diff=astextplain diff --git a/gd34emrs.iy3.txt b/gd34emrs.iy3.txt deleted file mode 100644 index f7bb7fe..0000000 --- a/gd34emrs.iy3.txt +++ /dev/null @@ -1,20 +0,0 @@ -noop - -# Rebase aaaf595..aaaf595 onto aaaf595 -# -# Commands: -# p, pick = use commit -# r, reword = use commit, but edit the commit message -# e, edit = use commit, but stop for amending -# s, squash = use commit, but meld into previous commit -# f, fixup = like "squash", but discard this commit's log message -# x, exec = run command (the rest of the line) using shell -# -# These lines can be re-ordered; they are executed from top to bottom. -# -# If you remove a line here THAT COMMIT WILL BE LOST. -# -# However, if you remove everything, the rebase will be aborted. -# -# Note that empty commits are commented out -