From 1fc0654d8e9a49bc2aa1be3e5690fd85e51fb668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Babi=C4=8D?= <peter@peterbabic.dev>
Date: Mon, 25 May 2015 16:04:10 +0200
Subject: [PATCH] post-merge fixes

---
 fuzzy-logic/.gitignore                        | 113 ------------------
 .../{bibliography.bib => fuzzy_logic.bib}     |   0
 fuzzy-logic/{fuzzy.pdf => fuzzy_logic.pdf}    | Bin 398665 -> 398665 bytes
 fuzzy-logic/{fuzzy.tex => fuzzy_logic.tex}    |   2 +-
 4 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 fuzzy-logic/.gitignore
 rename fuzzy-logic/{bibliography.bib => fuzzy_logic.bib} (100%)
 rename fuzzy-logic/{fuzzy.pdf => fuzzy_logic.pdf} (99%)
 rename fuzzy-logic/{fuzzy.tex => fuzzy_logic.tex} (99%)

diff --git a/fuzzy-logic/.gitignore b/fuzzy-logic/.gitignore
deleted file mode 100644
index 7aa2f69..0000000
--- a/fuzzy-logic/.gitignore
+++ /dev/null
@@ -1,113 +0,0 @@
-## Core latex/pdflatex auxiliary files:
-*.aux
-*.lof
-*.log
-*.lot
-*.fls
-*.out
-*.toc
-
-## Intermediate documents:
-*.dvi
-*-converted-to.*
-# these rules might exclude image files for figures etc.
-# *.ps
-# *.eps
-# *.pdf
-
-## Bibliography auxiliary files (bibtex/biblatex/biber):
-*.bbl
-*.bcf
-*.blg
-*-blx.aux
-*-blx.bib
-*.brf
-*.run.xml
-
-## Build tool auxiliary files:
-*.fdb_latexmk
-*.synctex.gz
-*.synctex.gz(busy)
-*.pdfsync
-
-## Auxiliary and intermediate files from other packages:
-
-# algorithms
-*.alg
-*.loa
-
-# amsthm
-*.thm
-
-# beamer
-*.nav
-*.snm
-*.vrb
-
-#(e)ledmac/(e)ledpar
-*.end
-*.[1-9]
-*.[1-9][0-9]
-*.[1-9][0-9][0-9]
-*.[1-9]R
-*.[1-9][0-9]R
-*.[1-9][0-9][0-9]R
-*.eledsec[1-9]
-*.eledsec[1-9]R
-*.eledsec[1-9][0-9]
-*.eledsec[1-9][0-9]R
-*.eledsec[1-9][0-9][0-9]
-*.eledsec[1-9][0-9][0-9]R
-
-# glossaries
-*.acn
-*.acr
-*.glg
-*.glo
-*.gls
-
-# hyperref
-*.brf
-
-# listings
-*.lol
-
-# makeidx
-*.idx
-*.ilg
-*.ind
-*.ist
-
-# minitoc
-*.maf
-*.mtc
-*.mtc0
-
-# minted
-*.pyg
-
-# morewrites
-*.mw
-
-# nomencl
-*.nlo
-
-# sagetex
-*.sagetex.sage
-*.sagetex.py
-*.sagetex.scmd
-
-# sympy
-*.sout
-*.sympy
-sympy-plots-for-*.tex/
-
-# todonotes
-*.tdo
-
-# xindy
-*.xdy
-
-# add files starting with
-~*
-.~*
diff --git a/fuzzy-logic/bibliography.bib b/fuzzy-logic/fuzzy_logic.bib
similarity index 100%
rename from fuzzy-logic/bibliography.bib
rename to fuzzy-logic/fuzzy_logic.bib
diff --git a/fuzzy-logic/fuzzy.pdf b/fuzzy-logic/fuzzy_logic.pdf
similarity index 99%
rename from fuzzy-logic/fuzzy.pdf
rename to fuzzy-logic/fuzzy_logic.pdf
index 52335481dca17993253ce796b0f9fb7b104d329b..01b462c4b0715b709c6b27b17110341f80f81389 100644
GIT binary patch
delta 118
zcmX@PO5)@yiG~)&7N!>F7M2#)Eo|GFSj`MfOwFh7VPcbmFt^`lVzcFQwlp+$GjKMx
nbaQhub1^ZtFgA5Fuy8Xla&&b9vYnmm6l@47*&Z**_KFz*nb;o0

delta 118
zcmX@PO5)@yiG~)&7N!>F7M2#)Eo|GFSWS(LjE$!6VPcbmFt^`lVzcFQc6Ky!H8e7J
ovoLcra&vPrcQkf&GcvI-b#=9HGca~?wo|Ynq-1-%AloZu0H%r`AOHXW

diff --git a/fuzzy-logic/fuzzy.tex b/fuzzy-logic/fuzzy_logic.tex
similarity index 99%
rename from fuzzy-logic/fuzzy.tex
rename to fuzzy-logic/fuzzy_logic.tex
index 34c0950..52d7d3b 100644
--- a/fuzzy-logic/fuzzy.tex
+++ b/fuzzy-logic/fuzzy_logic.tex
@@ -27,7 +27,7 @@
 % Remove small caps warning
 \renewcommand\mkbibacro[1]{{\footnotesize\MakeUppercase{#1}}}
 
-\addbibresource{bibliography.bib}
+\addbibresource{fuzzy_logic.bib}
 \graphicspath{{figures/}}
 
 \title[Fuzzy logic]{Fuzzy Logic}