diff options
Diffstat (limited to 'scons/.footprint.x86_64')
| -rw-r--r-- | scons/.footprint.x86_64 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scons/.footprint.x86_64 b/scons/.footprint.x86_64 index 7f34a3a55..22b620f15 100644 --- a/scons/.footprint.x86_64 +++ b/scons/.footprint.x86_64 @@ -271,10 +271,15 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/SCons/Tool/MSCommon/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/dvipdf.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/dvips.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/dvips.pyc +<<<<<<< HEAD -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/dvips.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f03.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f03.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f03.pyo +======= +-rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f03.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f03.pyc +>>>>>>> 7691015c39bc91b92f40924b2b8d930a9e154a49 -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f77.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f77.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/Tool/f77.pyo @@ -574,7 +579,10 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/SCons/compat/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/dblite.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/exitfuncs.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/exitfuncs.pyc +<<<<<<< HEAD -rw-r--r-- root/root usr/lib/python2.7/site-packages/SCons/exitfuncs.pyo +======= +>>>>>>> 7691015c39bc91b92f40924b2b8d930a9e154a49 -rw-r--r-- root/root usr/lib/python2.7/site-packages/scons-2.1.0-py2.7.egg-info drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ |