Commit 71fd8299 authored by efalcy's avatar efalcy Committed by llaffont

Resolve conflicts

Conflicts:
	.gitattributes
	.gitignore
	application/modules/admin/controllers/AlbumController.php
	application/modules/admin/controllers/HarvestController.php
	application/modules/admin/controllers/SystemeController.php
	cosmogramme/php/classes/classe_notice_avenio.php
	cosmogramme/php/classes/classe_notice_integration.php
	cosmogramme/php/classes/classe_unimarc.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/Album.php
	library/Class/FRBR/Link.php
	library/Class/Indexation.php
	library/Class/NatureDoc.php
	library/Class/Notice.php
	library/Class/Profil.php
	library/Class/WebService/BibNumerique/RessourceNumerique.php
	library/ZendAfi/Controller/Plugin/AdminAuth.php
	scripts/emacs/phafi-autoload.el
	tests/application/modules/admin/controllers/AdminAuthControllerTest.php
	tests/application/modules/admin/controllers/AlbumControllerTest.php
	tests/application/modules/admin/controllers/HarvestControllerTest.php
	tests/application/modules/opac/controllers/IndexControllerTest.php
	tests/library/Class/FRBR/LinkTest.php
	tests/library/Class/ProfilTest.php
parent 06b5aaac
# Ignoring compiled files in examples etc
examples/nodejs/**/*.js
examples/webos/**/*.js
server/FileServer*.js
# Ignoring Mac Finder files
.DS_Store
# Ignoring compiled files in st
st/*.js
# In case amber is also saved in a local Subversion
.svn
*.js
!assets/jquery-1.7.2.min.js
bin/
gen/
# Ignore emacs backup files
*~
\ No newline at end of file
config.php
ftp
charge*.txt
report
fichiers/cache
fichiers/log
fichiers/transferts
*~
\ No newline at end of file
......@@ -1312,6 +1312,7 @@ class notice_integration
}
}
<<<<<<< HEAD
class Pseudo_Notice {
......
.DS_Store
dist/*.js
node_modules
\ No newline at end of file
*.DS_Store
.DS_Store*
dev_examples/
cdn/
Embed.CDN.js
Embed.CDN.Generator.js
compiled/generator.html
compiled/index.html
compiled/generator-backup.html
compiled/js/storyjs-embed-cdn.js
compiled/js/storyjs-embed-generator.js
compiled/css/timeline-generator.css
*.tmproj
*.tmproject
tmtags
source/gfx/Sprites/
\ No newline at end of file
/INSTALL
/Makefile.in
/aclocal.m4
/build-stamp
/config.log
/config.status
/configure
/debian/debhelper.log
/debian/files
/debian/magit.debhelper.log
/debian/magit.postinst.debhelper
/debian/magit.prerm.debhelper
/install-sh
/install-stamp
/magit-*.tar.gz
/magit.info
/missing
/texinfo.tex
/debian/magit/
/autom4te.cache/
*.elc
*~
/magit.aux
/magit.cp
/magit.dvi
/magit.fn
/magit.ky
/magit.log
/magit.pg
/magit.toc
/magit.tp
/magit.vr
/magit.pdf
/magit.ps
/magit-pkg.el
magit.spec
50magit.el
/dir
*~
\#*\#
*.elc
\ No newline at end of file
extension/*
!extension/config.m4
!extension/php_xhprof.h
!extension/tests/
!extension/xhprof.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment